diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2021-01-15 18:31:43 +0100 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-01-21 02:46:34 +0000 |
| commit | a4b4483884ad2b5f2815993e429c6d95d56d6dba (patch) | |
| tree | aab9bd5deba9fd01363bfc4a0f020e95bfe825e7 /config | |
| parent | 888944b6398acc641f4f47abc8383ea5908d9d1f (diff) | |
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: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/673>
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/darwin.config b/config/darwin.config index 6e8210bf..afc91166 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -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 |