Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

MacPorts clang version selection, and OpenMP linking fix.

Browse source
This commit is contained in:
bruvzg 2017-12-14 20:41:50 +02:00
parent e1b374d5b6
commit 0571a36152
No known key found for this signature in database
GPG key ID: 89DD917D9CE4218D
3 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
platform/osx/SCsub
View file

@ -4,9 +4,10 @@ import os
Import('env')
def make_debug(target, source, env):
if (env["macports_clang"]):
if (env["macports_clang"] != 'no'):
mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local")
os.system(mpprefix + '/libexec/llvm-5.0/bin/llvm-dsymutil %s -o %s.dSYM' % (target[0], target[0]))
mpclangver = env["macports_clang"]
os.system(mpprefix + '/libexec/llvm-' + mpclangver + '/bin/llvm-dsymutil %s -o %s.dSYM' % (target[0], target[0]))
else:
os.system('dsymutil %s -o %s.dSYM' % (target[0], target[0]))

18
platform/osx/detect.py
View file

@ -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)