[pypy-commit] pypy default: Darwin: require 10.5 everywhere (for @rpath to work)

krono noreply at buildbot.pypy.org
Mon Jul 20 19:10:06 CEST 2015


Author: Tobias Pape <tobias at netshed.de>
Branch: 
Changeset: r78614:70a7870e6d1c
Date: 2015-07-20 19:09 +0200
http://bitbucket.org/pypy/pypy/changeset/70a7870e6d1c/

Log:	Darwin: require 10.5 everywhere (for @rpath to work)

diff --git a/rpython/translator/platform/darwin.py b/rpython/translator/platform/darwin.py
--- a/rpython/translator/platform/darwin.py
+++ b/rpython/translator/platform/darwin.py
@@ -2,12 +2,22 @@
 
 from rpython.translator.platform import posix
 
+#
+# Although Intel 32bit is supported since Apple Mac OS X 10.4, (and PPC since, ever)
+# the @rpath handling used in Darwin._args_for_shared is only availabe
+# since 10.5, so we use that as minimum requirement.
+#
+DARWIN_VERSION_MIN = '-mmacosx-version-min=10.5'
+
 class Darwin(posix.BasePosix):
     name = "darwin"
 
     standalone_only = ('-mdynamic-no-pic',)
     shared_only = ()
 
+    link_flags = (DARWIN_VERSION_MIN,)
+    cflags = ('-O3', '-fomit-frame-pointer', DARWIN_VERSION_MIN)
+
     so_ext = 'dylib'
     DEFAULT_CC = 'clang'
     rpath_flags = ['-Wl,-rpath', '-Wl, at executable_path/']
@@ -64,20 +74,13 @@
                                 icon=icon)
         return mk
 
+class Darwin_PowerPC(Darwin):#xxx fixme, mwp
+    name = "darwin_powerpc"
 
 class Darwin_i386(Darwin):
     name = "darwin_i386"
     DEFAULT_CC = 'clang -arch i386'
-    link_flags = ('-mmacosx-version-min=10.4',)
-    cflags = ('-O3', '-fomit-frame-pointer', '-mmacosx-version-min=10.4')
-
-class Darwin_PowerPC(Darwin):#xxx fixme, mwp
-    name = "darwin_powerpc"
-    link_flags = ()
-    cflags = ('-O3', '-fomit-frame-pointer')
 
 class Darwin_x86_64(Darwin):
     name = "darwin_x86_64"
     DEFAULT_CC = 'clang -arch x86_64'
-    link_flags = ('-mmacosx-version-min=10.5',)
-    cflags = ('-O3', '-fomit-frame-pointer', '-mmacosx-version-min=10.5')


More information about the pypy-commit mailing list