From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Mon, 26 Dec 2016 15:04:59 +0000 (+0800)
Subject: Move -std=c++11 cxxflag to PZSTD_CXXFLAGS
X-Git-Tag: v1.1.3^2~32^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F502%2Fhead;p=thirdparty%2Fzstd.git

Move -std=c++11 cxxflag to PZSTD_CXXFLAGS

Fixes the problem that the compiler doesn't enable c++11 mode by default
and the package build system has its own CXXFLAGS
---

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