diff options
| author | Edward Hervey <edward@centricular.com> | 2018-09-26 09:16:08 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-10-05 19:51:31 +0530 |
| commit | 54a4e3a10f880f5f0673a763fcbad26ad2b37544 (patch) | |
| tree | 5fef200aa24fbd4bbc298d926427dd6f90c8353c | |
| parent | 9a94deed37d5bf5a1f38421c26ceb9e61e5dfb7b (diff) | |
config: Use libc++ for both ios and osx
And specify it in a cleaner way than before (i.e. use the CXXFLAGS)
| -rw-r--r-- | config/darwin.config | 3 | ||||
| -rw-r--r-- | config/ios.config | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/darwin.config b/config/darwin.config index bec24595..034d61f5 100644 --- a/config/darwin.config +++ b/config/darwin.config @@ -93,6 +93,9 @@ os.environ['OBJCOPY'] = 'objcopy' os.environ['CC'] = 'clang' os.environ['OBJC'] = 'clang' os.environ['CXX'] = 'clang++' +# Since 10.10 libstdc++ is deprecated, and might no longer be +# shipped. Make sure we use libc++ instead +os.environ['CXXFLAGS'] += ' -stdlib=libc++ ' if target_arch != Architecture.UNIVERSAL: # Ensure lightweight architectures are build when only targetting one arch diff --git a/config/ios.config b/config/ios.config index d47b0f06..3767b9b7 100644 --- a/config/ios.config +++ b/config/ios.config @@ -114,7 +114,7 @@ os.environ['CFLAGS'] += extra_cflags os.environ['LDFLAGS'] += '-Wl,-undefined,error -Wl,-headerpad_max_install_names ' + extra_ldflags os.environ['OBJCFLAGS'] = os.environ['CFLAGS'] os.environ['OBJLDFLAGS'] = os.environ['LDFLAGS'] -os.environ['CXXFLAGS'] = os.environ['CFLAGS'] +os.environ['CXXFLAGS'] =' -stdlib=libc++ ' + os.environ['CFLAGS'] os.environ['AS']= 'as' if target_arch in [Architecture.X86, Architecture.X86_64]: |