Tiny update

diff --git a/Makefile b/Makefile
index bf29c678a5ef062131fe500c813076109c4b5097..394da50d8e5864509f331e261d54fbd4e4c8422d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,9 @@ CFLAGS += -fsanitize=thread
 # Tsan incompat with lto
 ifeq (${LTO}, 1)
 $(info Disabling LTO because TSAN is enabled)
-endif
 LTO=0
 endif
+endif
 
 ASAN ?= 0
 ifeq (${ASAN}, 1)
@@ -51,14 +51,14 @@ CFLAGS += -fsanitize=address
 # Tsan incompat with lto
 ifeq (${LTO}, 1)
 $(info Disabling LTO because ASAN is enabled)
-endif
 LTO=0
 endif
+endif
 
 ifeq (${CC}, gcc)
 ifeq (${LTO}, 1)
 $(info Disabling LTO because gcc has SSA corruption bug)
-CFLAGS += -flto -ffat-lto-objects
+LTO=0
 endif
 endif
 

diff --git a/conf.mk b/conf.mk
index 75d7d5594ace7bcff1eb977b5cdb1c64e35b1667..6c11b8114a1d6e09df44cb6a6672df9284da3d31 100644 (file)
--- a/conf.mk
+++ b/conf.mk
@@ -1,5 +1,5 @@
 #LTO=1
-CC=clang
+CC=gcc
 #UBSAN=1
 TSAN=1
 #ASAN=1