summaryrefslogtreecommitdiffstats
path: root/Makefile.pre.in
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2005-03-28 23:23:47 (GMT)
committerBob Ippolito <bob@redivi.com>2005-03-28 23:23:47 (GMT)
commit7026a0aeef15b678522f0f5cb045a086cdb41e6f (patch)
treeca216290d7a6b0294665e57d1f83a56027f7a6dd /Makefile.pre.in
parent0f9679d2b03b29cfcfd272f0d17bb1a6e88ae812 (diff)
downloadcpython-7026a0aeef15b678522f0f5cb045a086cdb41e6f.zip
cpython-7026a0aeef15b678522f0f5cb045a086cdb41e6f.tar.gz
cpython-7026a0aeef15b678522f0f5cb045a086cdb41e6f.tar.bz2
patch [1171735] - 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 5757215..e4d9008 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -113,8 +113,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@
@@ -374,7 +374,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 \