aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jeremie Girault <jeremie.girault@gmail.com>2016-10-04 13:26:30 +0200
committerGravatar Jeremie Girault <jeremie.girault@gmail.com>2016-12-16 11:07:51 +0100
commit9c0e9f1403c6d35b1ffdddb8cd1fb71f43648242 (patch)
treead18df925c8bf523e68b035b04b83aec8bdb9aec
parent2cf4f35a3820b7d3d3c67d78cebefaadfc549a02 (diff)
fix build on sierra by adding OSATOMIC_USE_INLINED=1 flag to compiler
-rw-r--r--Makefile2
-rw-r--r--build.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8f7328ae28..5128fac3f5 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 de9d253ef1..1217bb5912 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