diff options
| author |  Vijay Pai <vpai@google.com> | 2017-05-02 14:47:06 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2017-05-10 22:25:04 -0700 |
| commit | 6974763268e131addec3e64f25b6758f34e76c98 (patch) | |
| tree | f28289b408720c05c11f2caea3fa76393a8e81d7 /templates | |
| parent | 8aa652ff8321132c4b63719bb4e1982f7804248f (diff) | |
Stop checking for pre-c++11 compilers since these are no longer
supported
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 5ce606f828..a9dd171b84 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -206,10 +206,6 @@ TMPOUT = `mktemp /tmp/test-out-XXXXXX` endif - # Detect if we can use C++11 - CXX11_CHECK_CMD = $(CXX) -std=c++11 -o $(TMPOUT) -c test/build/c++11.cc - HAS_CXX11 = $(shell $(CXX11_CHECK_CMD) 2> /dev/null && echo true || echo false) - %for warning in CHECK_WARNINGS: ${warning_var('CHECK_%s_WORKS_CMD', warning)} = $(CC) -std=c99 -Werror -W${warning} -o $(TMPOUT) -c test/build/${warning}.c ${warning_var('HAS_WORKING_%s', warning)} = $(shell $(${warning_var('CHECK_%s_WORKS_CMD', warning)}) 2> /dev/null && echo true || echo false) @@ -230,11 +226,7 @@ HOST_LDXX ?= $(LDXX) CFLAGS += -std=c99 -Wsign-conversion -Wconversion ${' '.join(warning_var('$(W_%s)', warning) for warning in PREFERRED_WARNINGS)} - ifeq ($(HAS_CXX11),true) CXXFLAGS += -std=c++11 - else - CXXFLAGS += -std=c++0x - endif % for arg in ['CFLAGS', 'CXXFLAGS', 'CPPFLAGS', 'LDFLAGS', 'DEFINES']: % if defaults.get('global', []).get(arg, None) is not None: ${arg} += ${defaults.get('global').get(arg)} |