X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ceaf555e5ba90cfbfecd1d510d2dc88501bf0360..31667e6b38c3085889b2f81b2b68a91520d75e49:/hints/solaris_2.sh diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index b147b61..a20dd39 100644 --- a/hints/solaris_2.sh +++ b/hints/solaris_2.sh @@ -48,7 +48,7 @@ glibpth="$*" # /usr/lib/libdb.so.1, but that is not really meant for public consumption. # XXX Revisit after perl 5.10 -- should we apply this to older Solaris # versions too? (A.D. 11/2007). -case "`uname -r`" in +case "`$run uname -r`" in 5.[0-9]) ;; *) ignore_versioned_solibs=y ;; esac @@ -129,7 +129,7 @@ esac # Check that /dev/fd is mounted. If it is not mounted, let the # user know that suid scripts may not work. -mount | grep '^/dev/fd ' 2>&1 > /dev/null +$run mount | grep '^/dev/fd ' 2>&1 > /dev/null case $? in 0) ;; *) @@ -146,8 +146,17 @@ esac # See if libucb can be found in /usr/lib. If it is, warn the user # that this may cause problems while building Perl extensions. -/usr/bin/ls /usr/lib/libucb* >/dev/null 2>&1 -case $? in +found_libucb='' +case "$run" in +'') /usr/bin/ls /usr/lib/libucb* >/dev/null 2>&1 + found_libucb=$? + ;; +*) $run /usr/bin/ls '/usr/lib/libucb*' >/dev/null 2>&1 + found_libucb=$? + ;; +esac + +case $found_libucb in 0) cat <&4 @@ -173,7 +182,7 @@ esac make -v > make.vers 2>&1 if grep GNU make.vers > /dev/null 2>&1; then tmp=`type make | awk '{print $NF}' | sed 's/[()]//g'` - case "`/usr/bin/ls -lL $tmp`" in + case "`${ls:-'/usr/bin/ls'} -lL $tmp`" in ??????s*) cat <&2 @@ -220,7 +229,7 @@ cat > UU/cc.cbu <<'EOCBU' # Get gcc to share its secrets. echo 'int main() { return 0; }' > try.c # Indent to avoid propagation to config.sh - verbose=`${cc:-cc} -v -o try try.c 2>&1` + verbose=`${cc:-cc} $ccflags -v -o try try.c 2>&1` # XXX TODO: 'specs' output changed from 'Reading specs from' in gcc-[23] to 'Using # built-in specs' in gcc-4. Perhaps we should just use the same gcc test as @@ -243,12 +252,12 @@ in your ${cc:-cc} command. (Note that the trailing "/" is required.) END # Apparently not needed, at least for as 2.7 and later. - # cc="${cc:-cc} -B/usr/ccs/bin/" + # cc="${cc:-cc} $ccflags -B/usr/ccs/bin/" fi # See if ld(1) is GNU ld(1). GNU ld(1) might not work for this job. # Recompute $verbose since we may have just changed $cc. - verbose=`${cc:-cc} -v -o try try.c 2>&1 | grep ld 2>&1` + verbose=`${cc:-cc} $ccflags -v -o try try.c 2>&1 | grep ld 2>&1` if echo "$verbose" | grep ' /usr/ccs/bin/ld ' >/dev/null 2>&1; then # Ok, gcc directly calls the Solaris /usr/ccs/bin/ld. @@ -271,7 +280,7 @@ END # (This may all depend on local configurations too.) # Recompute verbose with -Wl,-v to find GNU ld if present - verbose=`${cc:-cc} -Wl,-v -o try try.c 2>&1 | grep /ld 2>&1` + verbose=`${cc:-cc} $ccflags -Wl,-v -o try try.c 2>&1 | grep /ld 2>&1` myld=`echo $verbose | awk '/\/ld/ {print $1}'` # This assumes that gcc's output will not change, and that @@ -300,7 +309,7 @@ doesn't work, you should use -B/usr/ccs/bin/ instead. END ccdlflags="$ccdlflags -Wl,-E" - lddlflags="$lddlflags -Wl,-E -G" + lddlflags="$lddlflags -Wl,-E -shared" fi fi @@ -323,21 +332,31 @@ int main() { return(0); } EOM - tryworkshopcc="${cc:-cc} try.c -o try" + tryworkshopcc="${cc:-cc} $ccflags try.c -o try" if $tryworkshopcc >/dev/null 2>&1; then - cc_name=`./try` + cc_name=`$run ./try` if test "$cc_name" = "workshop"; then - ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^cc: //ip'`" - if test ! "$use64bitall_done"; then - loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth" - fi + ccversion="`${cc:-cc} -V 2>&1|sed -n -e '1s/^[Cc][Cc]: //p'`" fi if test "$cc_name" = "workshop CC"; then - ccversion="`${cc:-CC} -V 2>&1|sed -n -e '1s/^CC: //ip'`" + ccversion="`${cc:-CC} -V 2>&1|sed -n -e '1s/^[Cc][C]: //p'`" + fi + case "$cc_name" in + workshop*) + # Settings for either cc or CC if test ! "$use64bitall_done"; then loclibpth="/usr/lib /usr/ccs/lib `$getworkshoplibs` $loclibpth" fi - fi + # Sun CC/cc don't support gcc attributes + d_attribute_format='undef' + d_attribute_malloc='undef' + d_attribute_nonnull='undef' + d_attribute_noreturn='undef' + d_attribute_pure='undef' + d_attribute_unused='undef' + d_attribute_warn_unused_result='undef' + ;; + esac fi # See if as(1) is GNU as(1). GNU might not work for this job. @@ -458,9 +477,9 @@ case "$uselargefiles" in ''|$define|true|[yY]*) # Keep these in the left margin. -ccflags_uselargefiles="`getconf LFS_CFLAGS 2>/dev/null`" -ldflags_uselargefiles="`getconf LFS_LDFLAGS 2>/dev/null`" -libswanted_uselargefiles="`getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`" +ccflags_uselargefiles="`$run getconf LFS_CFLAGS 2>/dev/null`" +ldflags_uselargefiles="`$run getconf LFS_LDFLAGS 2>/dev/null`" +libswanted_uselargefiles="`$run getconf LFS_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g'`" ccflags="$ccflags $ccflags_uselargefiles" ldflags="$ldflags $ldflags_uselargefiles" @@ -477,7 +496,7 @@ case "$usemorebits" in ;; esac -if test `uname -p` = i386; then +if test `$run uname -p` = i386; then case "$use64bitint" in "$define"|true|[yY]*) ccflags="$ccflags -DPTR_IS_LONG" @@ -485,13 +504,13 @@ if test `uname -p` = i386; then esac fi -if test `uname -p` = sparc -o `uname -p` = i386; then +if test `$run uname -p` = sparc -o `$run uname -p` = i386; then cat > UU/use64bitint.cbu <<'EOCBU' # This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64 bit integers. case "$use64bitint" in "$define"|true|[yY]*) - case "`uname -r`" in + case "`$run uname -r`" in 5.[0-4]) cat >&4 <&4 </dev/null" in *gcc*) echo 'int main() { return 0; }' > try.c - case "`${cc:-cc} -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in + case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in *"m64 is not supported"*) cat >&4 </dev/null` != X; then -# ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" +# if test $processor = sparc -a X`$run getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then +# ccflags="$ccflags -Wa,`$run getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" # fi ldflags="$ldflags -m64" - lddlflags="$lddlflags -G -m64" + + # See [perl #66604]: On Solaris 11, gcc -m64 on amd64 + # appears not to understand -G. (gcc -G has not caused + # problems on other platforms in the past.) gcc versions + # at least as old as 3.4.3 support -shared, so just + # use that with Solaris 11 and later, but keep + # the old behavior for older Solaris versions. + case "$osvers" in + 2.?|2.10) lddlflags="$lddlflags -G -m64" ;; + *) lddlflags="$lddlflags -shared -m64" ;; + esac ;; *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - getconfldflags="`getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`" - getconflddlflags="`getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`" + getconfccflags="`$run getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" + getconfldflags="`$run getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`" + getconflddlflags="`$run getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`" echo "int main() { return(0); } " > try.c case "`${cc:-cc} $getconfccflags try.c 2>&1 | grep 'deprecated'`" in *" -xarch=generic64 is deprecated, use -m64 "*)