From 02e061d88ce34721001820944ff768d6eb5dec07 Mon Sep 17 00:00:00 2001 From: Maksim Smolin Date: Mon, 21 Jan 2019 21:52:48 -0800 Subject: [PATCH] Fix XCode 10+ build issues (#55) --- AMBuildScript | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 13064b1..8f2565d 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -202,7 +202,7 @@ class MMSConfig(object): cxx.cflags += ['-mfpmath=sse'] if cxx.family == 'clang': cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch'] - if cxx.version >= 'clang-3.9': + if cxx.version >= 'clang-3.9' or cxx.version >= 'apple-clang-10.0': cxx.cxxflags += ['-Wno-expansion-to-defined'] if cxx.version >= 'clang-3.6' or cxx.version >= 'apple-clang-7.0': cxx.cxxflags += ['-Wno-inconsistent-missing-override'] @@ -275,9 +275,19 @@ class MMSConfig(object): cxx.linkflags += ['-lgcc_eh'] elif builder.target.platform == 'mac': cxx.defines += ['OSX', '_OSX', 'POSIX'] - cxx.cflags += ['-mmacosx-version-min=10.5'] + + if cxx.version >= 'apple-clang-10.0': + cxx.cflags += ['-mmacosx-version-min=10.9', '-stdlib=libc++'] + cxx.linkflags += [ + '-mmacosx-version-min=10.9', + ] + else: + cxx.cflags += ['-mmacosx-version-min=10.5'] + cxx.linkflags += [ + '-mmacosx-version-min=10.5', + ] + cxx.linkflags += [ - '-mmacosx-version-min=10.5', '-lc++', ] elif builder.target.platform == 'windows':