summaryrefslogtreecommitdiff
path: root/platform/osx
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2017-08-23 15:44:22 +0200
committerFabio Alessandrelli <fabio.alessandrelli@gmail.com>2017-08-23 15:44:22 +0200
commitd7f08ead4e09c106ef9a3c1f9aec9492dfcad683 (patch)
tree5590b137d1e5f49b6106f64a196cbbe7479aba32 /platform/osx
parentb4ad899ef64df6e341a4cbe52a15109cd3d6b2eb (diff)
Allow building fat binaries with osxcross
Diffstat (limited to 'platform/osx')
-rw-r--r--platform/osx/detect.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index d9891dda61..661da6e7c1 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -65,10 +65,14 @@ def configure(env):
else: # osxcross build
root = os.environ.get("OSXCROSS_ROOT", 0)
- if env["bits"] == "64":
+ if env["bits"] == "fat":
basecmd = root + "/target/bin/x86_64-apple-" + env["osxcross_sdk"] + "-"
- else:
+ env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
+ env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
+ elif env["bits"] == "32":
basecmd = root + "/target/bin/i386-apple-" + env["osxcross_sdk"] + "-"
+ else: # 64-bit, default
+ basecmd = root + "/target/bin/x86_64-apple-" + env["osxcross_sdk"] + "-"
env['CC'] = basecmd + "cc"
env['CXX'] = basecmd + "c++"