Skip to content

Commit 712979d

Browse files
* Fixes cut&paste error in configure
* Ensure that framework install works given the recent CFLAGS and BASECFLAGS changes
1 parent 1c99473 commit 712979d

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

Mac/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ PYTHONFRAMEWORK=@PYTHONFRAMEWORK@
1717
PYTHONFRAMEWORKIDENTIFIER=@PYTHONFRAMEWORKIDENTIFIER@
1818
LIPO_32BIT_FLAGS=@LIPO_32BIT_FLAGS@
1919
CC=@CC@
20+
MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
21+
export MACOSX_DEPLOYMENT_TARGET
22+
2023

2124

2225
# These are normally glimpsed from the previous set

Mac/PythonLauncher/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CC=@CC@
22
LD=@CC@
33
BASECFLAGS=@BASECFLAGS@
44
OPT=@OPT@
5-
CFLAGS=$(BASECFLAGS) $(OPT)
5+
CFLAGS=@CFLAGS@ $(BASECFLAGS) $(OPT)
66
LDFLAGS=@LDFLAGS@
77
srcdir= @srcdir@
88
VERSION= @VERSION@

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 79975 .
2+
# From configure.in Revision: 80191 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.2.
55
#
@@ -4750,7 +4750,7 @@ echo "$as_me: error: proper usage is --with-universal-arch=32-bit|64-bit|all|int
47504750
then
47514751
CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
47524752
LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
4753-
CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
4753+
CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
47544754
fi
47554755
fi
47564756

configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ yes)
961961
then
962962
CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
963963
LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
964-
CPPFLAGSFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
964+
CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
965965
fi
966966
fi
967967

0 commit comments

Comments
 (0)