From 4ccd6f16df4054133b4261a803a2305e12ddf3b3 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 26 Dec 2021 16:24:38 -0500 Subject: [PATCH] always enable C++17 The safe_flag check doesn't work properly for C++ flags with Clang so this wasn't getting enabled despite the conditional compilation being removed from the code, leading to breaking Clang builds. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bb339e3..2c3f78c 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ ifeq ($(CONFIG_NATIVE),true) endif CFLAGS := $(CFLAGS) -std=c11 $(SHARED_FLAGS) -Wmissing-prototypes -CXXFLAGS := $(CXXFLAGS) $(call safe_flag,-std=c++17,-std=c++14) $(SHARED_FLAGS) +CXXFLAGS := $(CXXFLAGS) -std=c++17 $(SHARED_FLAGS) LDFLAGS := $(LDFLAGS) -Wl,--as-needed,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text SOURCES := chacha.c h_malloc.c memory.c pages.c random.c util.c