Skip to content

S
Stunserver
Commit c015d12e authored by Ubuntu's avatar Ubuntu
Browse files
Options

default to -std=gnu++11 when needed

parent b47d7574
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
common.inc
View file @ c015d12e
...@@ -8,10 +8,13 @@ DEFINES := -DNDEBUG ...@@ -8,10 +8,13 @@ DEFINES := -DNDEBUG
# g++ versions less than 6 will default to C++ 98 # g++ versions less than 6 will default to C++ 98
ifeq ($(CXX),g++) ifeq ($(CXX),g++)
CPPSTD := $(shell test `g++ --version | grep ^g++ | sed 's/^.* //g' | cut -d '.' -f 1` -ge 6 || echo -std=gnu++11 ) lessthansix := $(shell expr `g++ -dumpversion | cut -d '.' -f 1` \< 6 )
ifeq ($(lessthansix), 1)
CPPSTD := -std=gnu++11
endif
endif endif
STANDARD_FLAGS := -Wall -Wuninitialized $(CPPSTD) STANDARD_FLAGS := -Wall -Wuninitialized
RELEASE_FLAGS := -O2 RELEASE_FLAGS := -O2
DEBUG_FLAGS := -g DEBUG_FLAGS := -g
...@@ -35,10 +38,10 @@ endif ...@@ -35,10 +38,10 @@ endif
%.hpp.gch: %.hpp %.hpp.gch: %.hpp
echo Building precompiled header: $@ echo Building precompiled header: $@
$(COMPILE.cpp) $(INCLUDES) $(DEFINES) $(STANDARD_FLAGS) $(FLAVOR_FLAGS) $^ $(COMPILE.cpp) $(CPPSTD) $(INCLUDES) $(DEFINES) $(STANDARD_FLAGS) $(FLAVOR_FLAGS) $^
%.o: %.cpp %.o: %.cpp
$(COMPILE.cpp) $(INCLUDES) $(DEFINES) $(STANDARD_FLAGS) $(FLAVOR_FLAGS) $^ $(COMPILE.cpp) $(CPPSTD) $(INCLUDES) $(DEFINES) $(STANDARD_FLAGS) $(FLAVOR_FLAGS) $^
# put "all" target first so that it is the default # put "all" target first so that it is the default
all: all:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment