Merge pull request #502 from Chocobo1/cpp11

Move -std=c++11 cxxflag to PZSTD_CXXFLAGS
This commit is contained in:
Yann Collet 2016-12-28 14:38:48 +01:00 committed by GitHub
commit 9b587e2135

View File

@ -26,7 +26,7 @@ POSTCOMPILE = mv -f $*.Td $*.d
# CFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS are for the users to override # CFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS are for the users to override
CFLAGS ?= -O3 -Wall -Wextra CFLAGS ?= -O3 -Wall -Wextra
CXXFLAGS ?= -O3 -Wall -Wextra -pedantic -std=c++11 CXXFLAGS ?= -O3 -Wall -Wextra -pedantic
CPPFLAGS ?= CPPFLAGS ?=
LDFLAGS ?= LDFLAGS ?=
@ -37,7 +37,7 @@ GTEST_INC = -isystem googletest/googletest/include
PZSTD_CPPFLAGS = $(PZSTD_INC) PZSTD_CPPFLAGS = $(PZSTD_INC)
PZSTD_CCXXFLAGS = PZSTD_CCXXFLAGS =
PZSTD_CFLAGS = $(PZSTD_CCXXFLAGS) PZSTD_CFLAGS = $(PZSTD_CCXXFLAGS)
PZSTD_CXXFLAGS = $(PZSTD_CCXXFLAGS) PZSTD_CXXFLAGS = $(PZSTD_CCXXFLAGS) -std=c++11
PZSTD_LDFLAGS = PZSTD_LDFLAGS =
EXTRA_FLAGS = EXTRA_FLAGS =
ALL_CFLAGS = $(EXTRA_FLAGS) $(CPPFLAGS) $(PZSTD_CPPFLAGS) $(CFLAGS) $(PZSTD_CFLAGS) ALL_CFLAGS = $(EXTRA_FLAGS) $(CPPFLAGS) $(PZSTD_CPPFLAGS) $(CFLAGS) $(PZSTD_CFLAGS)