Commit 147fbe5a authored by Martin v. Löwis's avatar Martin v. Löwis

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

Backported to 2.4.
parent b813c53c
...@@ -391,6 +391,9 @@ Library ...@@ -391,6 +391,9 @@ Library
Build 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 - Upgrade Windows build to zlib 1.2.3 which eliminates a potential security
vulnerability in zlib 1.2.1 and 1.2.2. vulnerability in zlib 1.2.1 and 1.2.2.
......
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.484 . # From configure.in Revision: 1.485 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for python 2.5. # Generated by GNU Autoconf 2.59 for python 2.5.
# #
...@@ -3265,9 +3265,11 @@ then ...@@ -3265,9 +3265,11 @@ then
if test -z "$CXX"; then if test -z "$CXX"; then
LINKCC="\$(PURIFY) \$(CC)" LINKCC="\$(PURIFY) \$(CC)"
else else
echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc
$CXX -c conftest.$ac_ext 2>&5 $CXX -c conftest_a.cc # 2>&5
if $CC -o conftest$ac_exeext conftest.$ac_objext 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 && test -s conftest$ac_exeext && ./conftest$ac_exeext
then then
LINKCC="\$(PURIFY) \$(CC)" LINKCC="\$(PURIFY) \$(CC)"
......
...@@ -471,9 +471,11 @@ then ...@@ -471,9 +471,11 @@ then
if test -z "$CXX"; then if test -z "$CXX"; then
LINKCC="\$(PURIFY) \$(CC)" LINKCC="\$(PURIFY) \$(CC)"
else else
echo 'void foo();int main(){foo();}void foo(){}' > conftest.$ac_ext echo 'extern "C" void foo();int main(){foo();}' > conftest_a.cc
$CXX -c conftest.$ac_ext 2>&5 $CXX -c conftest_a.cc # 2>&5
if $CC -o conftest$ac_exeext conftest.$ac_objext 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 && test -s conftest$ac_exeext && ./conftest$ac_exeext
then then
LINKCC="\$(PURIFY) \$(CC)" LINKCC="\$(PURIFY) \$(CC)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment