diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2001-10-18 15:35:38 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2001-10-18 15:35:38 (GMT) |
| commit | b7da67a873595f022c890783856f7ee764a00c3a (patch) | |
| tree | 4925d14bcdc7a21567c2923b0d4de246de807586 /configure.in | |
| parent | 316141b333991d6576c20817642d1f0ec2faa125 (diff) | |
| download | cpython-b7da67a873595f022c890783856f7ee764a00c3a.zip cpython-b7da67a873595f022c890783856f7ee764a00c3a.tar.gz cpython-b7da67a873595f022c890783856f7ee764a00c3a.tar.bz2 | |
Use CXX in LINKCC if CXX is used to build main() and the system requires
to link a C++ main using the C++ compiler. Fixes #472007.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 1c2f459..c2d617e 100644 --- a/configure.in +++ b/configure.in @@ -254,20 +254,36 @@ DLLLIBRARY='' LDLIBRARYDIR='' # LINKCC is the command that links the python executable -- default is $(CC). +# If CXX is set, and if it is needed to link a main function that was +# compiled with CXX, LINKCC is CXX instead. Always using CXX is undesirable: +# python might then depend on the C++ runtime # This is altered for AIX in order to build the export list before # linking. AC_SUBST(LINKCC) AC_MSG_CHECKING(LINKCC) if test -z "$LINKCC" then + if test -z "$CXX"; then + LINKCC="\$(PURIFY) \$(CC)" + else + echo 'int main(){return 0;}' > conftest.$ac_ext + $CXX -c conftest.$ac_ext 2>&5 + if $CC -o conftest$ac_exeext conftest.$ac_objext 2>&5 \ + && test -s conftest$ac_exeext && ./conftest$ac_exeext + then + LINKCC="\$(PURIFY) \$(CC)" + else + LINKCC="\$(PURIFY) \$(CXX)" + fi + rm -fr conftest* + fi case $ac_sys_system in AIX*) - LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); \$(PURIFY) \$(CC)";; + LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $(LINKCC)";; dgux*) - LINKCC="LD_RUN_PATH=$libdir \$(PURIFY) \$(CC)";; + LINKCC="LD_RUN_PATH=$libdir $(LINKCC)";; Monterey64*) - LINKCC="\$(PURIFY) \$(CC) -L/usr/lib/ia64l64";; - *) LINKCC="\$(PURIFY) \$(CC)";; + LINKCC="$(LINKCC) -L/usr/lib/ia64l64";; esac fi AC_MSG_RESULT($LINKCC) |