summaryrefslogtreecommitdiff
path: root/platform/osx/detect.py
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-21 22:34:55 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-21 22:34:55 -0300
commiteacb8f04c4697b8123afeec03088eebb3c4b20bd (patch)
tree8070f7807ec5d6a375df7184b151abbee8790608 /platform/osx/detect.py
parenta75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff)
parent4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'platform/osx/detect.py')
-rw-r--r--platform/osx/detect.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index 1f176dc22a..28bc42f6bb 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -68,9 +68,12 @@ def configure(env):
if (env["bits"]=="64"):
env.Append(CCFLAGS=['-arch', 'x86_64'])
env.Append(LINKFLAGS=['-arch', 'x86_64'])
- else:
+ elif (env["bits"]=="32"):
env.Append(CCFLAGS=['-arch', 'i386'])
env.Append(LINKFLAGS=['-arch', 'i386'])
+ else:
+ env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
+ env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
else:
#osxcross build
root=os.environ.get("OSXCROSS_ROOT",0)