From c8b948e202267a86cca642d6736ad9be31f5c0f9 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sat, 23 Mar 2019 19:46:54 -0400 Subject: [PATCH] enable C++17 support when available --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d4b4d9b..4619948 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ CONFIG_FREE_SLABS_QUARANTINE_RANDOM_LENGTH := 32 CONFIG_CLASS_REGION_SIZE := 137438953472 # 128GiB define safe_flag -$(shell $(CC) -E $1 - /dev/null 2>&1 && echo $1) +$(shell $(CC) -E $1 - /dev/null 2>&1 && echo $1 || echo $2) endef CPPFLAGS := -D_GNU_SOURCE @@ -28,7 +28,7 @@ ifeq ($(CONFIG_NATIVE),true) endif CFLAGS := -std=c11 $(SHARED_FLAGS) -Wmissing-prototypes -CXXFLAGS := -std=c++14 $(SHARED_FLAGS) +CXXFLAGS := $(call safe_flag,-std=c++17,-std=c++14) $(SHARED_FLAGS) LDFLAGS := -Wl,--as-needed,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text TIDY_CHECKS := -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter