summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2005-03-28 23:23:34 (GMT)
committerBob Ippolito <bob@redivi.com>2005-03-28 23:23:34 (GMT)
commitdf0784335c571dc10489cac4d01cc242d73f9014 (patch)
treeb130fd00ef0bcb90dd53b5e4be6f92fc5e5f6e35 /Makefile.pre.in
parent2513acf55b7dd5ab5267c97d20f5d51c51d5f19c (diff)
downloadcpython-df0784335c571dc10489cac4d01cc242d73f9014.zip
cpython-df0784335c571dc10489cac4d01cc242d73f9014.tar.gz
cpython-df0784335c571dc10489cac4d01cc242d73f9014.tar.bz2
patch [1171767] - Darwin 8's headers disable functionality when
POSIX is enabled. This prevents the toolbox glue, all of Carbon, and various other non-POSIX features from compiling. The POSIX symbols are still used by default, so turning off the #define doesn't hurt. Additionally, linker flags have changed for Darwin 8, and are different for Darwin 8/gcc4 (default) and Darwin 8/gcc3.3. Approved by Anthony
Diffstat (limited to 'Makefile.pre.in')
-rw-r--r--Makefile.pre.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index bfdda09..d20ce2b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -110,8 +110,8 @@ PYTHONFRAMEWORKINSTALLDIR= @PYTHONFRAMEWORKINSTALLDIR@
# Deployment target selected during configure, to be checked
# by distutils
CONFIGURE_MACOSX_DEPLOYMENT_TARGET=@CONFIGURE_MACOSX_DEPLOYMENT_TARGET@
-# Options to enable prebinding (for fast startup)
-OTHER_LIBTOOL_OPT = -prebind -seg1addr 0x10000000
+# Options to enable prebinding (for fast startup prior to Mac OS X 10.3)
+OTHER_LIBTOOL_OPT=@OTHER_LIBTOOL_OPT@
# Environment to run shared python without installed libraries
RUNSHARED= @RUNSHARED@
@@ -371,7 +371,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
$(RESSRCDIR)/English.lproj/InfoPlist.strings
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
- -framework System @LIBTOOL_CRUFT@
+ @LIBTOOL_CRUFT@
$(INSTALL) -d -m $(DIRMODE) \
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/Resources/English.lproj
$(INSTALL_DATA) $(RESSRCDIR)/Info.plist \