Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ jobs:
# env: COMPILER=g++-5 SAN_FLAGS="-fsanitize=undefined -fno-sanitize-recover -fno-omit-frame-pointer"
env:
- COMPILER="ccache /usr/bin/g++-5"
- EXTRA_CXXFLAGS="-D_GLIBCXX_DEBUG"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that EXTRA_CXXFLAGS also applied to the unit and regression tests in our Travis config. You are not currently doing so for the buildspec. That might actually be the explanation of the error, given the particular tests that are failing.

- WITH_MEMORY_ANALYZER=1

# OS X using clang++
Expand Down
1 change: 1 addition & 0 deletions buildspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ env:
variables:
# CodeBuild console doesn't display color codes correctly
TESTPL_COLOR_OUTPUT: 0
CP_EXTRA_CXXFLAGS: -D_GLIBCXX_DEBUG

phases:
install:
Expand Down
4 changes: 2 additions & 2 deletions src/common
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ first_target: all

HOSTCXX ?= $(CXX)

CP_CFLAGS += $(CFLAGS) $(INCLUDES)
CP_CXXFLAGS += $(CXXFLAGS) $(INCLUDES)
CP_CFLAGS += $(CFLAGS) $(CP_EXTRA_CFLAGS) $(INCLUDES)
CP_CXXFLAGS += $(CXXFLAGS) $(CP_EXTRA_CXXFLAGS) $(INCLUDES)

OBJ += $(patsubst %.cpp, %$(OBJEXT), $(filter %.cpp, $(SRC)))
OBJ += $(patsubst %.cc, %$(OBJEXT), $(filter %.cc, $(SRC)))
Expand Down