Commit a4b44838 authored by Andoni Morales Alastruey's avatar Andoni Morales Alastruey Committed by GStreamer Marge Bot

macOS: fix Objective-C++ cross-compilation

OBJCXXFLAGS are not being set correctly so  Objective-C++ files
were compiled with the build arch instead of the target one

Part-of: <!673>
parent 888944b6
......@@ -53,7 +53,7 @@ min_osx_sdk_version = min_osx_sdk_version or '10.11'
sdk='-mmacosx-version-min=%s -isysroot %s' % (min_osx_sdk_version, sdk_root)
# Initialize all these so we can just do += later
for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'OBJCFLAGS', 'CPPFLAGS', 'LDFLAGS']:
for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'OBJCFLAGS', 'OBJCXXFLAGS', 'CPPFLAGS', 'LDFLAGS']:
env[f] = env.get(f, '')
arch_cflags = ''
......@@ -78,7 +78,7 @@ if not os.path.exists(incl_dir):
os.makedirs(incl_dir)
# Append to these flags if not already present
for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'OBJCFLAGS']:
for f in ['CFLAGS', 'CCASFLAGS', 'CXXFLAGS', 'OBJCFLAGS', 'OBJCXXFLAGS']:
if arch_cflags not in env[f]:
env[f] += ' %s ' % arch_cflags
incflag = '-I' + incl_dir
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment