From 754e832a7f88128128d565afb40f5b74cea6052a Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Fri, 19 Nov 2021 23:40:41 -0800 Subject: [PATCH] don't do things that don't work in clang (#3584) Co-authored-by: Matthew Kennedy --- unit_tests/rules.mk | 8 -------- unit_tests/unit_test_rules.mk | 13 ++++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/unit_tests/rules.mk b/unit_tests/rules.mk index 2bfb7ad6e5..4df1b7fe5a 100644 --- a/unit_tests/rules.mk +++ b/unit_tests/rules.mk @@ -55,14 +55,6 @@ ADEFS = $(DADEFS) $(UADEFS) LIBS = $(DLIBS) $(ULIBS) # Various settings -IS_MAC = no -ifneq ($(OS),Windows_NT) - UNAME_S := $(shell uname -s) - ifeq ($(UNAME_S),Darwin) - IS_MAC = yes - endif -endif - ifeq ($(IS_MAC),yes) ODFLAGS = -x --syms ASFLAGS = $(MCFLAGS) -Wa $(ADEFS) diff --git a/unit_tests/unit_test_rules.mk b/unit_tests/unit_test_rules.mk index 2f1534a483..4fb38060ab 100644 --- a/unit_tests/unit_test_rules.mk +++ b/unit_tests/unit_test_rules.mk @@ -20,6 +20,13 @@ else SANITIZE = no endif +IS_MAC = no +ifneq ($(OS),Windows_NT) + UNAME_S := $(shell uname -s) + ifeq ($(UNAME_S),Darwin) + IS_MAC = yes + endif +endif # Compiler options here. ifeq ($(USE_OPT),) @@ -63,7 +70,11 @@ endif # Enable address sanitizer for C++ files, but not on Windows since x86_64-w64-mingw32-g++ doesn't support it. ifeq ($(SANITIZE),yes) - USE_CPPOPT += -fsanitize=address -fsanitize=bounds-strict -fno-sanitize-recover=all + ifeq ($(IS_MAC),yes) + USE_CPPOPT += -fsanitize=address + else + USE_CPPOPT += -fsanitize=address -fsanitize=bounds-strict -fno-sanitize-recover=all + endif endif # Enable this if you want the linker to remove unused code and data