diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-02 19:37:45 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-01-02 19:37:45 (GMT) |
| commit | f11d1832ec6aa06b3eeea67724d9d1ae42ea88a2 (patch) | |
| tree | 6db001e2046dbfa2d4a99ad9a3ad406d46292754 /configure | |
| parent | d823bdcb0e2b4680fb6e63e5e96e44c54efc8231 (diff) | |
| download | cpython-f11d1832ec6aa06b3eeea67724d9d1ae42ea88a2.zip cpython-f11d1832ec6aa06b3eeea67724d9d1ae42ea88a2.tar.gz cpython-f11d1832ec6aa06b3eeea67724d9d1ae42ea88a2.tar.bz2 | |
Merged revisions 87639 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87639 | antoine.pitrou | 2011-01-02 20:34:03 +0100 (dim., 02 janv. 2011) | 4 lines
Issue #10475: Don't hardcode compilers for LDSHARED/LDCXXSHARED on NetBSD
and DragonFly BSD. Patch by Nicolas Joly.
........
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 86076 . +# From configure.in Revision: 86848 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 2.7. # @@ -1934,11 +1934,11 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default - enum { N = $2 / 2 - 1 }; int main () { -static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; +static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; + 0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; test_array [0] = 0 ; @@ -1949,11 +1949,11 @@ if ac_fn_c_try_compile "$LINENO"; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default - enum { N = $2 / 2 - 1 }; int main () { -static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) +static int test_array [1 - 2 * !(enum { N = $2 / 2 - 1 }; + ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; test_array [0] = 0 @@ -7649,8 +7649,8 @@ then esac fi;; NetBSD*|DragonFly*) - LDSHARED="cc -shared" - LDCXXSHARED="c++ -shared";; + LDSHARED="$(CC) -shared" + LDCXXSHARED="$(CXX) -shared";; OpenUNIX*|UnixWare*) if test "$GCC" = "yes" ; then LDSHARED='$(CC) -shared' @@ -14309,8 +14309,8 @@ esac cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" +config_files="`echo $ac_config_files`" +config_headers="`echo $ac_config_headers`" _ACEOF |