From ccfb42c5b479c7dee38ef6eec66cd96ee6955e51 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sun, 28 Jul 2019 18:48:52 +0000 Subject: [PATCH] actually only CFLAGS, CPPFLAGS and LDFLAGS https://github.com/GrapheneOS/hardened_malloc/pull/92 https://github.com/GrapheneOS/hardened_malloc/pull/91#issuecomment-515784158 --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 54950f5..c2e55f7 100644 --- a/Makefile +++ b/Makefile @@ -25,19 +25,19 @@ $(shell $(CC) -E $1 - /dev/null 2>&1 && echo $1 || echo $2) endef CPPFLAGS := $(CPPFLAGS) -D_GNU_SOURCE -SHARED_FLAGS := $(SHARED_FLAGS) -O3 -flto -fPIC -fvisibility=hidden $(call safe_flag,-fno-plt) $(call safe_flag,-fstack-clash-protection) -fstack-protector-strong -pipe -Wall -Wextra $(call safe_flag,-Wcast-align=strict) -Wcast-qual -Wwrite-strings +SHARED_FLAGS := -O3 -flto -fPIC -fvisibility=hidden $(call safe_flag,-fno-plt) $(call safe_flag,-fstack-clash-protection) -fstack-protector-strong -pipe -Wall -Wextra $(call safe_flag,-Wcast-align=strict) -Wcast-qual -Wwrite-strings ifeq ($(CONFIG_NATIVE),true) SHARED_FLAGS += -march=native endif CFLAGS := $(CFLAGS) -std=c11 $(SHARED_FLAGS) -Wmissing-prototypes -CXXFLAGS := $(CXXFLAGS) $(call safe_flag,-std=c++17,-std=c++14) $(SHARED_FLAGS) +CXXFLAGS := $(call safe_flag,-std=c++17,-std=c++14) $(SHARED_FLAGS) LDFLAGS := $(LDFLAGS) -Wl,--as-needed,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text -TIDY_CHECKS := $(TIDY_CHECKS) -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-inconsistent-declaration-parameter-name,-readability-magic-numbers,-readability-named-parameter,-bugprone-too-small-loop-variable +TIDY_CHECKS := -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-inconsistent-declaration-parameter-name,-readability-magic-numbers,-readability-named-parameter,-bugprone-too-small-loop-variable -SOURCES := $(SOURCES) chacha.c h_malloc.c memory.c pages.c random.c util.c -OBJECTS := $(OBJECTS) $(SOURCES:.c=.o) +SOURCES := chacha.c h_malloc.c memory.c pages.c random.c util.c +OBJECTS := $(SOURCES:.c=.o) ifeq ($(CONFIG_CXX_ALLOCATOR),true) LDLIBS += -lstdc++