diff options
| author | Rainer Tammer <tammer@tammer.net> | 2008-12-04 11:32:11 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2008-12-04 11:14:02 +0000 |
| commit | fe5460cc78b3fdb133dac6113fd062486cbde848 (patch) | |
| tree | 1856f4cd11cab5c654f013744eb84e72104bbbcb /Makefile.SH | |
| parent | 68224244efd7abf4d1987743235ed5035fbf9be1 (diff) | |
| download | perl-fe5460cc78b3fdb133dac6113fd062486cbde848.tar.gz | |
AIX patches for Perl 5.8.9 RC2 and gcc on AIX + suidperl on AIX README.aix
Message-ID: <4937A39B.1070104@tammer.net>
[the rest, including unwinding change 34983 first]
p4raw-id: //depot/perl@35007
Diffstat (limited to 'Makefile.SH')
| -rw-r--r-- | Makefile.SH | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/Makefile.SH b/Makefile.SH index 6a14e4f7ab..2a902c3089 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -47,6 +47,7 @@ case "$d_dosuid" in esac linklibperl='$(LIBPERL)' +linklibperl_nonshr='' shrpldflags='$(LDDLFLAGS)' ldlibpth='' DPERL_EXTERNAL_GLOB='-DPERL_EXTERNAL_GLOB' @@ -104,6 +105,7 @@ true) esac shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib" linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl" + linklibperl_nonshr='-lperl_nonshr' ;; *) shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" @@ -115,6 +117,7 @@ true) esac shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib" linklibperl="-L $archlibexp/CORE -L `pwd | sed 's/\/UU$//'` -lperl" + linklibperl_nonshr='-lperl_nonshr' ;; esac ;; @@ -266,6 +269,7 @@ DLSUFFIX = .$dlext PLDLFLAGS = $pldlflags LIBPERL = $libperl LLIBPERL= $linklibperl +LLIBPERL_NONSHR= $linklibperl_nonshr SHRPENV = $shrpenv # Static targets are ordinarily built without CCCDLFLAGS. However, @@ -900,10 +904,24 @@ microperl: # checks as well as the special code to validate that the script in question # has been invoked correctly. +!NO!SUBS! + +case "${osname}" in +aix*) +$spitshell >>Makefile <<'!NO!SUBS!' +suidperl$(EXE_EXT): $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) + $(SHRPENV) $(LDLIBPTH) $(CC) -o suidperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(static_ext) $(LLIBPERL_NONSHR) $(LLIBPERL) `cat ext.libs` $(libs) + +!NO!SUBS! +;; +*) +$spitshell >>Makefile <<'!NO!SUBS!' suidperl$(EXE_EXT): $& sperl$(OBJ_EXT) perlmain$(OBJ_EXT) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) $(SHRPENV) $(LDLIBPTH) $(CC) -o suidperl $(CLDFLAGS) $(CCDLFLAGS) perlmain$(OBJ_EXT) sperl$(OBJ_EXT) $(static_ext) $(LLIBPERL) `cat ext.libs` $(libs) !NO!SUBS! +;; +esac fi |