diff options
| -rw-r--r-- | make/linux/makefiles/adlc.make | 2 | ||||
| -rw-r--r-- | make/linux/makefiles/gcc.make | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/make/linux/makefiles/adlc.make b/make/linux/makefiles/adlc.make index 8a866917b..4e47232c7 100644 --- a/make/linux/makefiles/adlc.make +++ b/make/linux/makefiles/adlc.make @@ -59,7 +59,7 @@ Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED) INCLUDES += $(Src_Dirs_I:%=-I%) # set flags for adlc compilation -CXXFLAGS = $(SYSDEFS) $(INCLUDES) +CXXFLAGS = $(SYSDEFS) $(INCLUDES) -std=gnu++98 # Force assertions on. CXXFLAGS += -DASSERT diff --git a/make/linux/makefiles/gcc.make b/make/linux/makefiles/gcc.make index 2807ebbc4..06c881f24 100644 --- a/make/linux/makefiles/gcc.make +++ b/make/linux/makefiles/gcc.make @@ -218,7 +218,12 @@ ifeq ($(USE_CLANG),) # Since GCC 5, there are some deprecated declarations warnings. They break compilation ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 5 \) )" "1" - WARNING_FLAGS += -Wno-error=deprecated-declarations + WARNING_FLAGS += -Wno-error=deprecated-declarations + endif + + # GCC 6 compilation fix + ifeq "$(shell expr \( $(CC_VER_MAJOR) \>= 6 \) )" "1" + WARNING_FLAGS += -std=gnu++98 endif endif |