summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Oussoren <ronaldoussoren@mac.com>2010-04-20 19:51:33 (GMT)
committerRonald Oussoren <ronaldoussoren@mac.com>2010-04-20 19:51:33 (GMT)
commit712979d2928d6c1d252b61095d234506c99ac19c (patch)
tree57d30d7548881a8c3f0efadc3f8788f8f9dd9c3e
parent1c994733bb668d26b0ebbc85c5b382f00a08f64f (diff)
downloadcpython-712979d2928d6c1d252b61095d234506c99ac19c.zip
cpython-712979d2928d6c1d252b61095d234506c99ac19c.tar.gz
cpython-712979d2928d6c1d252b61095d234506c99ac19c.tar.bz2
* Fixes cut&paste error in configure
* Ensure that framework install works given the recent CFLAGS and BASECFLAGS changes
-rw-r--r--Mac/Makefile.in3
-rw-r--r--Mac/PythonLauncher/Makefile.in2
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
4 files changed, 7 insertions, 4 deletions
diff --git a/Mac/Makefile.in b/Mac/Makefile.in
index 5fb5cd4..bea5f99 100644
--- a/Mac/Makefile.in
+++ b/Mac/Makefile.in
@@ -17,6 +17,9 @@ PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
CC=@CC@
+MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
+export MACOSX_DEPLOYMENT_TARGET
+
# These are normally glimpsed from the previous set
diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in
index 96493ad..539ed1a 100644
--- a/Mac/PythonLauncher/Makefile.in
+++ b/Mac/PythonLauncher/Makefile.in
@@ -2,7 +2,7 @@ CC=@CC@
LD=@CC@
BASECFLAGS=@BASECFLAGS@
OPT=@OPT@
-CFLAGS=$(BASECFLAGS) $(OPT)
+CFLAGS=@CFLAGS@ $(BASECFLAGS) $(OPT)
LDFLAGS=@LDFLAGS@
srcdir= @srcdir@
VERSION= @VERSION@
diff --git a/configure b/configure
index 9045b51..37e0576 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 79975 .
+# From configure.in Revision: 80191 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@@ -4750,7 +4750,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
then
CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
- CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+ CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
fi
fi
diff --git a/configure.in b/configure.in
index 2751b0e..7f8945e 100644
--- a/configure.in
+++ b/configure.in
@@ -961,7 +961,7 @@ yes)
then
CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
- CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
+ CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
fi
fi