Skip to content

Commit 44458f6

Browse files
committed
Move LIBCXX_DEBUG flag from Travis to AWS codebuild
The Travis build takes too long to complete with this flag set; moving it to AWS CodeBuild means we can take advantage of AWS' longer timeout and even the load between Travis and AWS.
1 parent 1ec7061 commit 44458f6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: .travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ jobs:
107107
# env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
108108
env:
109109
- COMPILER="ccache /usr/bin/g++-5"
110-
- EXTRA_CXXFLAGS="-D_GLIBCXX_DEBUG"
111110
- WITH_MEMORY_ANALYZER=1
112111

113112
# OS X using clang++

Diff for: buildspec.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ env:
44
variables:
55
# CodeBuild console doesn't display color codes correctly
66
TESTPL_COLOR_OUTPUT: 0
7+
CP_EXTRA_CXXFLAGS: -D_GLIBCXX_DEBUG
78

89
phases:
910
install:

Diff for: src/common

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ first_target: all
210210

211211
HOSTCXX ?= $(CXX)
212212

213-
CP_CFLAGS += $(CFLAGS) $(INCLUDES)
214-
CP_CXXFLAGS += $(CXXFLAGS) $(INCLUDES)
213+
CP_CFLAGS += $(CFLAGS) $(CP_EXTRA_CFLAGS) $(INCLUDES)
214+
CP_CXXFLAGS += $(CXXFLAGS) $(CP_EXTRA_CXXFLAGS) $(INCLUDES)
215215

216216
OBJ += $(patsubst %.cpp, %$(OBJEXT), $(filter %.cpp, $(SRC)))
217217
OBJ += $(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC)))

0 commit comments

Comments
 (0)