1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
Description: Remove -isystem flag to fix build on GCC-6
Author: Afif Elghraoui <afif@debian.org>
Forwarded: no
Last-Update: 2016-07-16
--- a/make/Defs.mk
+++ b/make/Defs.mk
@@ -53,8 +53,8 @@ else
CXX_STRICT_FLAGS = $(CXX_FLAGS) -pedantic -std=$(CPP_STD) -Wall
endif
-CXX = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_FLAGS) $(INCLUDES) -isystem $(BOOST) $(LDFLAGS)
-CXX_STRICT = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_STRICT_FLAGS) $(INCLUDES) -isystem $(BOOST) $(LDFLAGS)
+CXX = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_FLAGS) $(INCLUDES) -I$(BOOST) $(LDFLAGS)
+CXX_STRICT = $(CCACHE) $(GXX) $(MACHINE) $(CPPFLAGS) $(CXXFLAGS) $(CXX_STRICT_FLAGS) $(INCLUDES) -I$(BOOST) $(LDFLAGS)
ifeq ($(UNAME), Darwin)
SHLIB_FLAGS = -shared -undefined dynamic_lookup
--- a/make/Tests.mk
+++ b/make/Tests.mk
@@ -27,7 +27,7 @@ $(TEST_OBJS): CXX_OPT_FLAGS := $(CXX_OPT
$(TEST_OBJS): $(TEST_BUILD_ROOT)/%.o : %.cpp $(CXX_LIB)
-mkdir -p $(TEST_BUILD_ROOT)
- $(CXX) -isystem $(GMOCK_ROOT) -c $< -o $@
+ $(CXX) -I$(GMOCK_ROOT) -c $< -o $@
$(TESTS_EXECUTABLE): $(TEST_OBJS) $(CXX_LIB) $(GMOCK_LIBSRC) $(GMOCK_MAIN)
$(CXX) $(COVERAGE) $(TEST_OBJS) $(CXX_LIB) -I$(GMOCK_ROOT) $(GMOCK_LIBSRC) $(GMOCK_MAIN) -lpthread -o $@
|
