Skip to content
Permalink
Browse files

Fix for OSX Lion: Don't include -arch flag on newer versions

  • Loading branch information...
apavlo committed Feb 10, 2012
1 parent 739c582 commit 03289731545e24ff94bfe2da93bca77767c7cfdc
Showing with 8 additions and 1 deletion.
  1. +7 −1 build.py
  2. +1 −0 buildtools.py
@@ -138,7 +138,13 @@
CTX.JNIBINFLAGS += " -ljava -ljvm -lverify"

if CTX.PLATFORM == "Darwin":
CTX.CPPFLAGS += " -DMACOSX -arch x86_64"
CTX.CPPFLAGS += " -DMACOSX "

# 2012-02-10
# Don't include the 'arch' flag for newer versions of OSX
if int(CTX.PLATFORM_VERSION.split(".")) < 11:
CTX.CPPFLAGS += " -arch x86_64"

CTX.JNIEXT = "jnilib"
CTX.JNILIBFLAGS = " -bundle"
CTX.JNIBINFLAGS = " -framework JavaVM,1.6"
@@ -22,6 +22,7 @@ def __init__(self, args):
self.THIRD_PARTY_INPUT = {}
self.TESTS = {}
self.PLATFORM = os.uname()[0]
self.PLATFORM_VERSION = os.uname()[2]
self.LEVEL = "DEBUG"
self.TARGET = "BUILD"
self.NM = "/usr/bin/nm"

0 comments on commit 0328973

Please sign in to comment.
You can’t perform that action at this time.