diff options
-rw-r--r-- | ext/re/Makefile.PL | 9 | ||||
-rw-r--r-- | hints/aix.sh | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ext/re/Makefile.PL b/ext/re/Makefile.PL index bc31b2c2cc..f337db191f 100644 --- a/ext/re/Makefile.PL +++ b/ext/re/Makefile.PL @@ -1,12 +1,19 @@ use ExtUtils::MakeMaker; use File::Spec; +use Config; + +my $object = 're_exec$(OBJ_EXT) re_comp$(OBJ_EXT) re$(OBJ_EXT)'; + +if ($^O eq 'aix' && defined($Config{'ccversion'}) && $Config{'ccversion'} eq '3.6.6.0') { + $object .= ' ../../deb$(OBJ_EXT)'; +} WriteMakefile( NAME => 're', VERSION_FROM => 're.pm', MAN3PODS => {}, # Pods will be built by installman. XSPROTOARG => '-noprototypes', - OBJECT => 're_exec$(OBJ_EXT) re_comp$(OBJ_EXT) re$(OBJ_EXT)', + OBJECT => $object, DEFINE => '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG', clean => { FILES => '*$(OBJ_EXT) *.c ../../lib/re.pm' }, ); diff --git a/hints/aix.sh b/hints/aix.sh index cf7e43cce7..35ee662350 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -130,6 +130,13 @@ case "$cc" in *gcc*) ccdlflags='-Xlinker' ;; *) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | awk '{print $2}'` case "$ccversion" in + '') ccversion=`lslpp -L | grep 'IBM C and C++ Compilers LUM$' | awk '{print $2}'` + ;; + esac + case "$ccversion" in + 3.6.6.0) + optimize='none' + ;; 4.4.0.0|4.4.0.1|4.4.0.2) echo >&4 "*** This C compiler ($ccversion) is outdated." echo >&4 "*** Please upgrade to at least 4.4.0.3." |