Index: test/make/Makefile.rules =================================================================== --- test/make/Makefile.rules +++ test/make/Makefile.rules @@ -340,18 +340,6 @@ endif #---------------------------------------------------------------------- -# Check if we are compiling with gcc 4.6 -#---------------------------------------------------------------------- -ifneq (,$(filter g++,$(CXX))) - CXXVERSION = $(shell g++ -dumpversion | cut -b 1-3) - ifeq "$(CXXVERSION)" "4.6" - # GCC 4.6 cannot handle -std=c++11, so replace it with -std=c++0x - # instead. FIXME: remove once GCC version is upgraded. - override CXXFLAGS := $(subst -std=c++11,-std=c++0x,$(CXXFLAGS)) - endif -endif - -#---------------------------------------------------------------------- # DYLIB_ONLY variable can be used to skip the building of a.out. # See the sections below regarding dSYM file as well as the building of # EXE from all the objects.