mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* Fixes cut&paste error in configure 

* Ensure that framework install works given the
  recent CFLAGS and BASECFLAGS changes
This commit is contained in:
Ronald Oussoren 2010-04-20 19:51:33 +00:00
parent 1c994733bb
commit 712979d292
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mac/Makefile.in
View File

@ -17,6 +17,9 @@ PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@ PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@ LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
CC=@CC@ CC=@CC@
MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
export MACOSX_DEPLOYMENT_TARGET
# These are normally glimpsed from the previous set # These are normally glimpsed from the previous set

2
Mac/PythonLauncher/Makefile.in
View File

@ -2,7 +2,7 @@ CC=@CC@
LD=@CC@ LD=@CC@
BASECFLAGS=@BASECFLAGS@ BASECFLAGS=@BASECFLAGS@
OPT=@OPT@ OPT=@OPT@
CFLAGS=$(BASECFLAGS) $(OPT) CFLAGS=@CFLAGS@ $(BASECFLAGS) $(OPT)
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@
srcdir= @srcdir@ srcdir= @srcdir@
VERSION= @VERSION@ VERSION= @VERSION@

4
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 79975 . # From configure.in Revision: 80191 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2. # 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 then
CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}" CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}" LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}" CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
fi fi
fi fi

2
configure.in
View File

@ -961,7 +961,7 @@ yes)
then then
CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}" CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}" LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}" CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
fi fi
fi fi