Merged revisions 84946 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84946 | antoine.pitrou | 2010-09-21 17:19:14 +0200 (mar., 21 sept. 2010) | 4 lines

  Issue #1633863: Don't ignore $CC under AIX.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 8a8dcb4e30b7cbe61bacb4543f0b734ab31478a5..64d15e23e5b391fb0a6550792965e5b53776b1de 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -332,6 +332,8 @@ Tools/Demos
 Build
 -----
 
+- Issue #1633863: Don't ignore $CC under AIX.
+
 - Issue #9552: Avoid unnecessary rebuild of OpenSSL. (Windows)
 
 - Issue #9810: Compile bzip2 source files in python's project file

diff --git a/configure b/configure
index 254cae7cf196befc89606136f110806e285bb0fb..78968e69c31909552150ec369b616430e76ee077 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 84676 .
+# From configure.in Revision: 84683 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 2.7.
 #
@@ -3181,7 +3181,7 @@ if test "${with_gcc+set}" = set; then :
 else
 
        case $ac_sys_system in
-       AIX*)   CC=cc_r
+       AIX*)   CC=${CC:-xlc_r}
                without_gcc=;;
        BeOS*)
                case $BE_HOST_CPU in

diff --git a/configure.in b/configure.in
index 51cdaa5ea4594b0b8848fcf86f8b780b5f5a8683..390781851acd6c7499f7707209a7d3c776eed0be 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -479,7 +479,7 @@ AC_ARG_WITH(gcc,
                without_gcc=$withval;;
        esac], [
        case $ac_sys_system in
-       AIX*)   CC=cc_r
+       AIX*)   CC=${CC:-xlc_r}
                without_gcc=;;
        BeOS*)
                case $BE_HOST_CPU in