Merge branch 'main' into formatter

2 files changed, 3 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 278649f5..5a9ac756 100644
--- a/Makefile
+++ b/Makefile
@@ -58,11 +58,7 @@ ifeq ($(shell $(CC) -v 2>&1 | grep -c "gcc version"), 1)
 			 -Wlogical-op -Wpacked-not-aligned -Wshadow=compatible-local -Wshadow=global -Wshadow=local \
 			 -Wsuggest-attribute=const -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
 			 -Wsync-nand -Wtrampolines -Wvector-operation-performance -Wcast-align=strict
-	CCONFIG += -fsanitize=signed-integer-overflow -fno-sanitize-recover -fno-signaling-nans
-endif
-
-ifeq ($(shell $(CC) -v 2>&1 | grep -c "clang version"), 1)
-	CCONFIG += -fno-finite-math-only 
+	CCONFIG += -fsanitize=signed-integer-overflow -fno-sanitize-recover -fno-signaling-nans -fno-finite-math-only 
 endif
 
 OS := $(shell uname -s)
diff --git a/src/tomo.c b/src/tomo.c
index 7780f0a2..4d400a57 100644
--- a/src/tomo.c
+++ b/src/tomo.c
@@ -82,7 +82,7 @@ static OptionalBool_t verbose = false, quiet = false, show_version = false, show
 static OptionalText_t show_codegen = NONE_TEXT,
                       cflags = Text("-Werror -fdollars-in-identifiers -std=c2x -Wno-trigraphs "
                                     " -ffunction-sections -fdata-sections"
-                                    " -fno-signed-zeros -fno-finite-math-only "
+                                    " -fno-signed-zeros "
                                     " -D_XOPEN_SOURCE -D_DEFAULT_SOURCE -fPIC -ggdb"
 #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__)
                                     " -D_BSD_SOURCE"
@@ -252,7 +252,7 @@ int main(int argc, char *argv[]) {
     bool is_gcc = (system(String(cc, " -v 2>&1 | grep -q 'gcc version'")) == 0);
     if (is_gcc) {
         cflags = Texts(cflags, Text(" -fsanitize=signed-integer-overflow -fno-sanitize-recover"
-                                    " -fno-signaling-nans -fno-trapping-math"));
+                                    " -fno-signaling-nans -fno-trapping-math -fno-finite-math-only"));
     }
 
     bool is_clang = (system(String(cc, " -v 2>&1 | grep -q 'clang version'")) == 0);