From 84e9ef525ef2c2b22567b5e6b8ca791d35c59726 Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Mon, 30 Jan 2017 09:58:16 +0100 Subject: [PATCH] Do not enforce -std=c+11 on Linux. Commit 52d9a05a0f3d ("Backport from master: Optimized hash function for lock manager and hash join") adds "-std=c++11" to CXXFLAGS on Linux unconditionally. This doesn't seem to be necessary (looks rather like an omission) and breaks the build on distributions with old gcc versions (e.g. SLES 11 SP4). --- builds/posix/prefix.linux | 2 -- builds/posix/prefix.linux_amd64 | 2 -- 2 files changed, 4 deletions(-) diff --git a/builds/posix/prefix.linux b/builds/posix/prefix.linux index 56d1529570c..e9f3f8adc48 100644 --- a/builds/posix/prefix.linux +++ b/builds/posix/prefix.linux @@ -28,5 +28,3 @@ DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS) # This file must be compiled with SSE4.2 support %/CRC32C.o: COMMON_FLAGS += -msse4 - -CXXFLAGS := $(CXXFLAGS) -std=c++11 diff --git a/builds/posix/prefix.linux_amd64 b/builds/posix/prefix.linux_amd64 index 394286f3345..6d432e13315 100644 --- a/builds/posix/prefix.linux_amd64 +++ b/builds/posix/prefix.linux_amd64 @@ -28,5 +28,3 @@ DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS) -fmax-errors=8 # This file must be compiled with SSE4.2 support %/CRC32C.o: COMMON_FLAGS += -msse4 - -CXXFLAGS := $(CXXFLAGS) -std=c++11