Switch around OPT assignments in Don Beaudry's patch for Olimit (his

code had the assignments switched around).

Also rename sharedmodules to lib-dynload.
This commit is contained in:
Guido van Rossum 1997-10-20 23:10:56 +00:00
parent cbfcb17e96
commit 304dd2defb
2 changed files with 7 additions and 7 deletions

8
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# From configure.in Revision: 1.68
# From configure.in Revision: 1.69
# Guess values for system-dependent variables and create Makefiles.
# Generated automatically using autoconf version 2.12
@ -1134,7 +1134,7 @@ fi
echo "$ac_t""$ac_cv_olimit_ok" 1>&6
if test $ac_cv_olimit_ok = yes; then
OPT="$OPT -OPT:Olimit=0"
OPT="$OPT -Olimit 1500"
fi
echo $ac_n "checking whether $CC accepts -OPT:Olimit=0""... $ac_c" 1>&6
@ -1169,7 +1169,7 @@ fi
echo "$ac_t""$ac_cv_opt_olimit_ok" 1>&6
if test $ac_cv_olimit_ok = yes; then
OPT="$OPT -Olimit 1500"
OPT="$OPT -OPT:Olimit=0"
fi
# check for ANSI or K&R ("traditional") preprocessor
@ -1862,7 +1862,7 @@ then
case $ac_sys_system/$ac_sys_release in
AIX*) LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
hp*|HP*)
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/sharedmodules";;
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux*) LINKFORSHARED="-rdynamic";;
next/*) LINKFORSHARED="-u libsys_s";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;

View File

@ -190,7 +190,7 @@ AC_TRY_RUN([int main() { return 0; }],
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_cv_olimit_ok)
if test $ac_cv_olimit_ok = yes; then
OPT="$OPT -OPT:Olimit=0"
OPT="$OPT -Olimit 1500"
fi
AC_MSG_CHECKING(whether $CC accepts -OPT:Olimit=0)
@ -203,7 +203,7 @@ AC_TRY_RUN([int main() { return 0; }],
CC="$ac_save_cc"])
AC_MSG_RESULT($ac_cv_opt_olimit_ok)
if test $ac_cv_olimit_ok = yes; then
OPT="$OPT -Olimit 1500"
OPT="$OPT -OPT:Olimit=0"
fi
# check for ANSI or K&R ("traditional") preprocessor
@ -310,7 +310,7 @@ then
case $ac_sys_system/$ac_sys_release in
AIX*) LINKFORSHARED='-Wl,-bE:$(srcdir)/python.exp -lld';;
hp*|HP*)
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/sharedmodules";;
LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux*) LINKFORSHARED="-rdynamic";;
next/*) LINKFORSHARED="-u libsys_s";;
SCO_SV*) LINKFORSHARED="-Bdynamic -dy -Wl,-Bexport";;