From b34e60bb25b5f6d3ddddb1893b85c5e4da61fd45 Mon Sep 17 00:00:00 2001 From: Max Wash Date: Fri, 24 Mar 2023 14:17:56 +0000 Subject: [PATCH] build: switch to C17 / C++17 --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 03ce1a6..1b30657 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,14 @@ LIBC_OBJ := $(addprefix $(BUILD_DIR)/,$(LIBC_C_FILES:.c=.o)) BUILD_ID := $(shell tools/generate_build_id.py --arch $(SOCKS_ARCH)) -CFLAGS := $(CFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" -g -Wall -Werror -pedantic -fPIC \ - -Iinclude -Iarch/$(SOCKS_ARCH)/include -Ilibc/include -Wno-language-extension-token +CWARNINGS := -Wall -Werror -pedantic -Wno-language-extension-token -Wno-unused-function -Wno-gnu-statement-expression + +CFLAGS := $(CFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" -g -fPIC -std=gnu17 \ + -Iinclude -Iarch/$(SOCKS_ARCH)/include -Ilibc/include $(CWARNINGS) + +CXXFLAGS := $(CXXFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" -g -fPIC -std=gnu++17 \ + -Iinclude -Iarch/$(SOCKS_ARCH)/include -Ilibc/include -Wno-language-extension-token $(CWARNINGS) -CXXFLAGS := $(CFLAGS) $(CXXFLAGS) ASMFLAGS := $(ASMFLAGS) -DBUILD_ID=\"$(BUILD_ID)\" LDFLAGS := $(LDFLAGS) -g -lgcc