summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common.mak2
-rwxr-xr-xconfigure1
2 files changed, 2 insertions, 1 deletions
diff --git a/common.mak b/common.mak
index 59b039fa67..3f2096d230 100644
--- a/common.mak
+++ b/common.mak
@@ -39,7 +39,7 @@ CCFLAGS = $(CPPFLAGS) $(CFLAGS)
OBJCFLAGS += $(EOBJCFLAGS)
OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS)
ASFLAGS := $(CPPFLAGS) $(ASFLAGS)
-CXXFLAGS += $(CPPFLAGS) $(CFLAGS)
+CXXFLAGS := $(CPPFLAGS) $(CFLAGS) $(CXXFLAGS)
YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm
HOSTCCFLAGS = $(IFLAGS) $(HOSTCPPFLAGS) $(HOSTCFLAGS)
diff --git a/configure b/configure
index 94a0a6c7a2..3787894d1d 100755
--- a/configure
+++ b/configure
@@ -4519,6 +4519,7 @@ fi
add_cppflags -D_ISOC99_SOURCE
add_cxxflags -D__STDC_CONSTANT_MACROS
+add_cxxflags -std=c++11
check_cflags -std=c99
check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
#include <stdlib.h>