Merge pull request #8274 from jeremiegirault/fix/sierra-build

fix build on macOS sierra by adding OSATOMIC_USE_INLINED=1 flag to compiler
8 years ago · ee31910271
parent 639d6a4bb3 9c0e9f1403
commit ee31910271
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -328,7 +328,7 @@ CXXFLAGS += -std=c++11
 else
 CXXFLAGS += -std=c++0x
 endif
-CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
+CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
 LDFLAGS += -g

 CPPFLAGS += $(CPPFLAGS_$(CONFIG))
--- a/build.yaml
+++ b/build.yaml
@ -3956,7 +3956,7 @@ defaults:
    CPPFLAGS: -Ithird_party/boringssl/include -fvisibility=hidden -DOPENSSL_NO_ASM
      -D_GNU_SOURCE -DWIN32_LEAN_AND_MEAN -D_HAS_EXCEPTIONS=0 -DNOMINMAX
  global:
-    CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter
+    CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
    LDFLAGS: -g
  zlib:
    CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration