Merge "Have the sanitizers trap rather than abort." into main
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 049e7ff..83be006 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -404,7 +404,6 @@
     my_ldflags += -fsanitize=$(fsanitize_arg)
   else
     my_cflags += -fsanitize-trap=all
-    my_cflags += -ftrap-function=abort
     ifneq ($(filter address thread,$(my_sanitize)),)
       my_cflags += -fno-sanitize-trap=address,thread
       my_shared_libraries += libdl