From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 7 Aug 2005 21:08:54 +0000 (+0000)
Subject: Patch #1239112: Correct LINKCC C++ test. Fixes #1189330.
X-Git-Tag: v2.4.2c1~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f01c2da3bbb0505b79dce9ffbc7dededd9d5115;p=thirdparty%2FPython%2Fcpython.git

Patch #1239112: Correct LINKCC C++ test. Fixes #1189330.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 0e6c3b8a0fe8..6cb41ca73dbf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -93,6 +93,9 @@ Library
 Build
 -----
 
+- Bug #1189330: configure did not correctly determine the necessary
+  value of LINKCC if python was built with GCC 4.0.
+
 - Upgrade Windows build to zlib 1.2.3 which eliminates a potential security
   vulnerability in zlib 1.2.1 and 1.2.2.
 
diff --git a/configure b/configure
index 1186834a3c68..a68ce2d64684 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.475.2.7 .
+# From configure.in Revision: 1.475.2.8 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for python 2.4.
 #
@@ -3265,9 +3265,11 @@ then
         if test -z "$CXX"; then
               LINKCC="\$(PURIFY) \$(CC)"
         else
-              echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext
-              $CXX -c conftest.$ac_ext 2>&5
-              if $CC -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
+              echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc
+              $CXX -c conftest_a.cc # 2>&5
+              echo 'void foo(){}' > conftest_b.$ac_ext
+              $CC -c conftest_b.$ac_ext # 2>&5
+              if $CC -o conftest$ac_exeext conftest_a.$ac_objext conftest_b.$ac_objext 2>&5 \
                  && test -s conftest$ac_exeext && ./conftest$ac_exeext
               then
                  LINKCC="\$(PURIFY) \$(CC)"
diff --git a/configure.in b/configure.in
index a4fb112831ce..5ad6adbc711f 100644
--- a/configure.in
+++ b/configure.in
@@ -471,9 +471,11 @@ then
         if test -z "$CXX"; then
               LINKCC="\$(PURIFY) \$(CC)"
         else
-              echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext
-              $CXX -c conftest.$ac_ext 2>&5
-              if $CC -o conftest$ac_exeext conftest.$ac_objext 2>&5 \
+              echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc
+              $CXX -c conftest_a.cc # 2>&5
+              echo 'void foo(){}' > conftest_b.$ac_ext
+              $CC -c conftest_b.$ac_ext # 2>&5
+              if $CC -o conftest$ac_exeext conftest_a.$ac_objext conftest_b.$ac_objext 2>&5 \
                  && test -s conftest$ac_exeext && ./conftest$ac_exeext
               then
                  LINKCC="\$(PURIFY) \$(CC)"