diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-03-19 21:31:28 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-03-19 21:31:28 +0000 |
| commit | 3a7209f1a0e0ec8f7d98c18df2233cb998b39ffc (patch) | |
| tree | 96e887059b568abfade644085e4982d2a810c131 /ext/DynaLoader | |
| parent | 982b7775e1ad97c44654b5fd0132bfeb9eacc46e (diff) | |
| download | perl-3a7209f1a0e0ec8f7d98c18df2233cb998b39ffc.tar.gz | |
Integrate changes #9244,9247,9250 from maintperl into mainline.
Dynaloading in 64-bit AIX with vac.
p4raw-link: @9250 on //depot/maint-5.6/perl: cbdca039b5e144d1778a3f526024bb6da2a58a72
p4raw-link: @9247 on //depot/maint-5.6/perl: 1d70f4d9891a32fb9ebe5b896f754b8c759ffece
p4raw-link: @9244 on //depot/maint-5.6/perl: f816f13eaa91bfe02a64ccda4a80eee889237c24
p4raw-id: //depot/perl@9251
p4raw-integrated: from //depot/maint-5.6/perl@9243 'copy in'
ext/DynaLoader/hints/aix.pl (@5902..) ext/DynaLoader/dl_aix.xs
(@9247..) 'merge in' hints/aix.sh (@8537..)
Diffstat (limited to 'ext/DynaLoader')
| -rw-r--r-- | ext/DynaLoader/dl_aix.xs | 9 | ||||
| -rw-r--r-- | ext/DynaLoader/hints/aix.pl | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs index b2c92d8070..1f51961259 100644 --- a/ext/DynaLoader/dl_aix.xs +++ b/ext/DynaLoader/dl_aix.xs @@ -62,13 +62,18 @@ /* Older AIX C compilers cannot deal with C++ double-slash comments in the ibmcxx and/or xlC includes. Since we only need a single file, be more fine-grained about what's included <hirschs@btv.ibm.com> */ + #ifdef USE_libC /* The define comes, when it comes, from hints/aix.pl. */ # define LOAD loadAndInit # define UNLOAD terminateAndUnload -# if defined(USE_xlC_load_h) -# include "/usr/lpp/xlC/include/load.h" +# if defined(USE_vacpp_load_h) +# include "/usr/vacpp/include/load.h" # elif defined(USE_ibmcxx_load_h) # include "/usr/ibmcxx/include/load.h" +# elif defined(USE_xlC_load_h) +# include "/usr/lpp/xlC/include/load.h" +# else +# include "/usr/include/load.h" # endif #else # define LOAD load diff --git a/ext/DynaLoader/hints/aix.pl b/ext/DynaLoader/hints/aix.pl index 7dde941b43..b1f8c7f2bf 100644 --- a/ext/DynaLoader/hints/aix.pl +++ b/ext/DynaLoader/hints/aix.pl @@ -2,7 +2,9 @@ use Config; if ($Config{libs} =~ /-lC/ && -f '/lib/libC.a') { $self->{CCFLAGS} = $Config{ccflags} . ' -DUSE_libC'; - if (-f '/usr/ibmcxx/include/load.h') { + if (-f '/usr/vacpp/include/load.h') { + $self->{CCFLAGS} .= ' -DUSE_vacpp_load_h'; + } elsif (-f '/usr/ibmcxx/include/load.h') { $self->{CCFLAGS} .= ' -DUSE_ibmcxx_load_h'; } elsif (-f '/usr/lpp/xlC/include/load.h') { $self->{CCFLAGS} .= ' -DUSE_xlC_load_h'; |