summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-09-21 15:23:10 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-09-21 15:23:10 (GMT)
commit6e41347df7d2b069b431110c536596cbf62bc540 (patch)
tree20684b048fcf53b6afd2e5a202769e3e8ec37cfb
parentbd5283f7ad090d32be737030191b7e6d11a4f354 (diff)
downloadcpython-6e41347df7d2b069b431110c536596cbf62bc540.zip
cpython-6e41347df7d2b069b431110c536596cbf62bc540.tar.gz
cpython-6e41347df7d2b069b431110c536596cbf62bc540.tar.bz2
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. ........
-rw-r--r--Misc/NEWS2
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
3 files changed, 5 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 22cffdc..a437351 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -565,6 +565,8 @@ Extension Modules
Build
-----
+- Issue #1633863: Don't ignore $CC under AIX.
+
- Issue #9810: Compile bzip2 source files in python's project file
directly. It used to be built with bzip2's makefile.
diff --git a/configure b/configure
index 7313145..4a2f352 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 84675 .
+# From configure.in Revision: 84682 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.1.
#
@@ -3131,7 +3131,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=;;
*) without_gcc=no;;
esac
diff --git a/configure.in b/configure.in
index 73ab4a4..0cd5514 100644
--- a/configure.in
+++ b/configure.in
@@ -435,7 +435,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=;;
*) without_gcc=no;;
esac])