makefile fixes for c++11/c++17

Makefile

@@ -42,6 +42,9 @@ DEBUG=${ALL_DEBUG}
 #export EXTRALINK
 export MAKE
 export CURVER?=2.6.0
+export CPLUSPLUS=$(shell ${CC} -dM -E -x c++  /dev/null | grep -F __cplusplus | grep -Po '\d\d\d\d\d\dL')
+$(warning __cplusplus=${CPLUSPLUS})
+
 ifneq (,$(wildcard /etc/os-release))
 	DISTRO := $(shell awk -F= '/^NAME/{print $$2}' /etc/os-release)
 else

lib/Makefile

@@ -123,23 +123,25 @@ PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE))
 PSQLCH=
 ifeq ($(PROXYSQLCLICKHOUSE),1)
 	PSQLCH=-DPROXYSQLCLICKHOUSE
-ifeq ($(IS_CXX17),1)
-	PSQLCH=-DPROXYSQLCLICKHOUSE -std=c++17 -DCXX17
-endif
 endif
 
 
 # 'libhttpserver': Add 'ENABLE_EPOLL' by default for all platforms except
 # for 'Darwin'. This is required when compiling 'libhttpserver' for avoiding
 # internal use of 'SELECT' in favor of 'EPOLL'. See #3591.
+ENABLE_EPOLL=-DENABLE_EPOLL
 ifeq ($(UNAME_S),Darwin)
 ENABLE_EPOLL=
-else
-ENABLE_EPOLL=-DENABLE_EPOLL
 endif
 
 MYCFLAGS=$(IDIRS) $(OPTZ) $(DEBUG) -Wall -DGITVERSION=\"$(GIT_VERSION)\" $(NOJEM) $(WGCOV) $(WASAN)
-MYCXXFLAGS=-std=c++11 $(MYCFLAGS) $(PSQLCH) $(ENABLE_EPOLL)
+
+MYCXXFLAGS=-std=c++11 -DCXX11
+ifeq ($(IS_CXX17),1)
+	MYCXXFLAGS=-std=c++17 -DCXX17
+endif
+MYCXXFLAGS+= $(MYCFLAGS) $(PSQLCH) $(ENABLE_EPOLL)
+
 
 default: libproxysql.a
 .PHONY: default

src/Makefile

@@ -118,9 +118,6 @@ PROXYSQLCLICKHOUSE := $(shell echo $(PROXYSQLCLICKHOUSE))
 PSQLCH=
 ifeq ($(PROXYSQLCLICKHOUSE),1)
 	PSQLCH=-DPROXYSQLCLICKHOUSE
-ifeq ($(IS_CXX17),1)
-	PSQLCH=-DPROXYSQLCLICKHOUSE -std=c++17 -DCXX17
-endif
 endif
 
 
@@ -145,7 +142,10 @@ ifeq ($(TEST_WITHASANVAR),1)
 WASAN+= -DTEST_WITHASAN
 endif
 
-MYCXXFLAGS=-std=c++11
+MYCXXFLAGS=-std=c++11 -DCXX11
+ifeq ($(IS_CXX17),1)
+	MYCXXFLAGS=-std=c++17 -DCXX17
+endif
 ifeq ($(CXX),clang++)
 	MYCXXFLAGS+= -fuse-ld=lld
 endif