From 9c0e9f1403c6d35b1ffdddb8cd1fb71f43648242 Mon Sep 17 00:00:00 2001 From: Jeremie Girault Date: Tue, 4 Oct 2016 13:26:30 +0200 Subject: [PATCH] fix build on sierra by adding OSATOMIC_USE_INLINED=1 flag to compiler --- Makefile | 2 +- build.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8f7328ae285..5128fac3f57 100644 --- a/Makefile +++ b/Makefile @@ -351,7 +351,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)) diff --git a/build.yaml b/build.yaml index de9d253ef1c..1217bb5912c 100644 --- a/build.yaml +++ b/build.yaml @@ -3794,7 +3794,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