Merged revisions 80191 via svnmerge from

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

................
  r80191 | ronald.oussoren | 2010-04-18 21:07:43 +0200 (Sun, 18 Apr 2010) | 13 lines

  Merged revisions 80187 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80187 | ronald.oussoren | 2010-04-18 19:59:37 +0200 (Sun, 18 Apr 2010) | 6 lines

    Add the OSX universal binary related options
    to CFLAGS instead of BASECFLAGS.

    This fixes issue 8366 and is needed due to
    changes introduced in the fix for issue 1628484.
  ........
................

diff --git a/configure b/configure
index 891ed9cc047e8a988863b97d14884545d4e8fa22..c122fa619698ec44bcdbbb64abcda5367b5145d8 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 79117 .
+# From configure.in Revision: 79354 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -3843,7 +3843,7 @@ else
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 
 
@@ -4661,6 +4661,22 @@ echo "${ECHO_T}$ac_cv_no_strict_aliasing_ok" >&6; }
        Darwin*)
            # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
            # used to be here, but non-Apple gcc doesn't accept them.
+            if test "${CC}" = gcc
+           then
+               { echo "$as_me:$LINENO: checking which compiler should be used" >&5
+echo $ECHO_N "checking which compiler should be used... $ECHO_C" >&6; }
+               case "${UNIVERSALSDK}" in
+               */MacOSX10.4u.sdk)
+                       # Build using 10.4 SDK, force usage of gcc when the
+                       # compiler is gcc, otherwise the user will get very
+                       # confusing error messages when building on OSX 10.6
+                       CC=gcc-4.0
+                       CPP=cpp-4.0
+                       ;;
+               esac
+               { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
+           fi
 
 
            if test "${enable_universalsdk}"; then
@@ -4699,10 +4715,12 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
                 fi
 
 
-               BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
-               tgt=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
-               if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then
-                       CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
+               CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
+               if test "${UNIVERSALSDK}" != "/"
+               then
+                       CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
+                       LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+                       CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
                fi
            fi
 
@@ -5397,7 +5415,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -5418,7 +5436,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -6516,7 +6534,7 @@ _ACEOF
 
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
 echo "${ECHO_T}$was_it_defined" >&6; }
@@ -7046,7 +7064,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -14461,7 +14479,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 else
   unistd_defines_pthreads=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
     { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
 echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -15929,7 +15947,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "yes" >/dev/null 2>&1; then
   ipv6type=$i
 fi
-rm -f conftest*
+rm -f -r conftest*
 
                        ;;
                kame)
@@ -15952,7 +15970,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6libdir=/usr/local/v6/lib
                                ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
                        ;;
                linux-glibc)
@@ -15973,7 +15991,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   ipv6type=$i;
                                ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
                        ;;
                linux-inet6)
@@ -16011,7 +16029,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6lib=inet6;
                                ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -f -r conftest*
 
                        ;;
                v6d)
@@ -16034,7 +16052,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6libdir=/usr/local/v6/lib;
                                BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f conftest*
+rm -f -r conftest*
 
                        ;;
                zeta)
@@ -16056,7 +16074,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
                                ipv6lib=inet6;
                                ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -f -r conftest*
 
                        ;;
                esac
@@ -24309,7 +24327,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -24328,7 +24346,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -24598,7 +24616,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 

diff --git a/configure.in b/configure.in
index 4008d2c255960fd44572c8f524a58900095be5df..0f2ce8968c276682f29fe67454a2f05cfc21e822 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -912,6 +912,20 @@ yes)
        Darwin*)
            # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
            # used to be here, but non-Apple gcc doesn't accept them.
+            if test "${CC}" = gcc
+           then
+               AC_MSG_CHECKING(which compiler should be used)
+               case "${UNIVERSALSDK}" in
+               */MacOSX10.4u.sdk)
+                       # Build using 10.4 SDK, force usage of gcc when the 
+                       # compiler is gcc, otherwise the user will get very
+                       # confusing error messages when building on OSX 10.6
+                       CC=gcc-4.0
+                       CPP=cpp-4.0
+                       ;;
+               esac
+               AC_MSG_RESULT($CC)
+           fi
 
 
            if test "${enable_universalsdk}"; then
@@ -948,10 +962,12 @@ yes)
                 fi
 
 
-               BASECFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
-               tgt=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
-               if test "${UNIVERSALSDK}" != "/" -a "${tgt}" '>' '10.4' ; then
-                       CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
+               CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
+               if test "${UNIVERSALSDK}" != "/"
+               then
+                       CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
+                       LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
+                       CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
                fi
            fi