diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2017-12-14 20:41:50 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2017-12-14 20:41:50 +0200 |
| commit | 0571a3615273b1939c3868c13f933f5a96f464f7 (patch) | |
| tree | 9453171ac31fda693726e73dad32bcbc2af1d1b7 /platform/osx/detect.py | |
| parent | e1b374d5b624c1e0a09d8c6e5c11fc53f8d90423 (diff) | |
| download | redot-engine-0571a3615273b1939c3868c13f933f5a96f464f7.tar.gz | |
MacPorts clang version selection, and OpenMP linking fix.
Diffstat (limited to 'platform/osx/detect.py')
| -rw-r--r-- | platform/osx/detect.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 77a4ee1a48..e8a8319431 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -72,19 +72,19 @@ def configure(env): else: # 64-bit, default env.Append(CCFLAGS=['-arch', 'x86_64']) env.Append(LINKFLAGS=['-arch', 'x86_64']) - if (env["macports_clang"]): + if (env["macports_clang"] != 'no'): mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local") - env["CC"] = mpprefix + "/libexec/llvm-5.0/bin/clang" - env["LD"] = mpprefix + "/libexec/llvm-5.0/bin/clang++" - env["CXX"] = mpprefix + "/libexec/llvm-5.0/bin/clang++" - env['AR'] = mpprefix + "/libexec/llvm-5.0/bin/llvm-ar" - env['RANLIB'] = mpprefix + "/libexec/llvm-5.0/bin/llvm-ranlib" - env['AS'] = mpprefix + "/libexec/llvm-5.0/bin/llvm-as" + mpclangver = env["macports_clang"] + env["CC"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang" + env["LD"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" + env["CXX"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" + env['AR'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ar" + env['RANLIB'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib" + env['AS'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-as" env.Append(CCFLAGS=['-D__MACPORTS__']) #hack to fix libvpx MM256_BROADCASTSI128_SI256 define if (env["openmp"]): env.Append(CPPFLAGS=['-fopenmp']) - env.Append(LINKFLAGS=['-L' + mpprefix + '/lib/libomp/']) - env.Append(LIBS=['gomp']) + env.Append(LINKFLAGS=['-fopenmp']) else: # osxcross build root = os.environ.get("OSXCROSS_ROOT", 0) |