aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2017-05-02 14:47:06 -0700
committerGravatar Vijay Pai <vpai@google.com>2017-05-10 22:25:04 -0700
commit6974763268e131addec3e64f25b6758f34e76c98 (patch)
treef28289b408720c05c11f2caea3fa76393a8e81d7 /Makefile
parent8aa652ff8321132c4b63719bb4e1982f7804248f (diff)
Stop checking for pre-c++11 compilers since these are no longer
supported
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 0 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 1a8ee553ca..b28c0fb9e1 100644
--- a/Makefile
+++ b/Makefile
@@ -308,10 +308,6 @@ else
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)
-
CHECK_SHADOW_WORKS_CMD = $(CC) -std=c99 -Werror -Wshadow -o $(TMPOUT) -c test/build/shadow.c
HAS_WORKING_SHADOW = $(shell $(CHECK_SHADOW_WORKS_CMD) 2> /dev/null && echo true || echo false)
ifeq ($(HAS_WORKING_SHADOW),true)
@@ -342,11 +338,7 @@ HOST_LD ?= $(LD)
HOST_LDXX ?= $(LDXX)
CFLAGS += -std=c99 -Wsign-conversion -Wconversion $(W_SHADOW) $(W_EXTRA_SEMI)
-ifeq ($(HAS_CXX11),true)
CXXFLAGS += -std=c++11
-else
-CXXFLAGS += -std=c++0x
-endif
CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
LDFLAGS += -g