diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2000-02-28 23:39:26 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2000-02-28 23:39:26 +0000 |
| commit | bab3591f9fe41314b6f0fcfe82b37895cadc6fc3 (patch) | |
| tree | 32565e50c4d4f6434a8c811b86cc809a535c2973 /ext | |
| parent | 4cc87e5d7e477e9e407eb2b921760421a995b9b5 (diff) | |
| download | perl-bab3591f9fe41314b6f0fcfe82b37895cadc6fc3.tar.gz | |
More AIX fixes from Steven Hirsch.
p4raw-id: //depot/cfgperl@5333
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/DynaLoader/dl_aix.xs | 10 | ||||
| -rw-r--r-- | ext/DynaLoader/hints/aix.pl | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs index 0a92af7ca6..35242ed652 100644 --- a/ext/DynaLoader/dl_aix.xs +++ b/ext/DynaLoader/dl_aix.xs @@ -54,11 +54,17 @@ * of load() and unload() from libC and libC_r need to be used, * otherwise statics in the extensions won't get initialized right. * -- Stephanie Beals <bealzy@us.ibm.com> */ + +/* 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 -# ifdef USE_load_h -# include <load.h> +# if defined(USE_xlC_load_h) +# include "/usr/lpp/xlC/include/load.h" +# elif defined(USE_ibmcxx_load_h) +# include "/usr/ibmcxx/include/load.h" # endif #else # define LOAD load diff --git a/ext/DynaLoader/hints/aix.pl b/ext/DynaLoader/hints/aix.pl index 4225979320..7dde941b43 100644 --- a/ext/DynaLoader/hints/aix.pl +++ b/ext/DynaLoader/hints/aix.pl @@ -3,8 +3,8 @@ use Config; if ($Config{libs} =~ /-lC/ && -f '/lib/libC.a') { $self->{CCFLAGS} = $Config{ccflags} . ' -DUSE_libC'; if (-f '/usr/ibmcxx/include/load.h') { - $self->{CCFLAGS} .= ' -I/usr/ibmcxx/include -DUSE_load_h'; + $self->{CCFLAGS} .= ' -DUSE_ibmcxx_load_h'; } elsif (-f '/usr/lpp/xlC/include/load.h') { - $self->{CCFLAGS} .= ' -I/usr/lpp/xlC/include -DUSE_load_h'; + $self->{CCFLAGS} .= ' -DUSE_xlC_load_h'; } } |