From ecdac445275159593d5f8626e695f7a826cc288c Mon Sep 17 00:00:00 2001 From: Hongli Lai <hongli@phusion.nl> Date: Tue, 8 Oct 2024 17:43:54 +0200 Subject: [PATCH] Fix AddressSanitizer --- build/basics.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/basics.rb b/build/basics.rb index 6ecaa98ee7..755bfb7a24 100644 --- a/build/basics.rb +++ b/build/basics.rb @@ -116,7 +116,7 @@ result << " " << compiler_flag_option('EXTRA_CFLAGS') if !compiler_flag_option('EXTRA_CFLAGS').empty? result << " #{PlatformInfo.address_sanitizer_flags}" if USE_ASAN && PlatformInfo.address_sanitizer_flags result << " #{PlatformInfo.undefined_behavior_sanitizer_flags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_flags - result << " -fno-omit-frame-pointer -fno-optimize-sibling-calls" if USE_ASAN + result << " -fno-omit-frame-pointer" if USE_ASAN result << " -fno-optimize-sibling-calls" if USE_ASAN && PlatformInfo.cc_supports_fno_optimize_sibling_calls_flag? result << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true) result @@ -126,7 +126,7 @@ result << " " << compiler_flag_option('EXTRA_CXXFLAGS') if !compiler_flag_option('EXTRA_CXXFLAGS').empty? result << " #{PlatformInfo.address_sanitizer_flags}" if USE_ASAN && PlatformInfo.address_sanitizer_flags result << " #{PlatformInfo.undefined_behavior_sanitizer_flags}" if USE_UBSAN && PlatformInfo.undefined_behavior_sanitizer_flags - result << " -fno-omit-frame-pointer -fno-optimize-sibling-calls" if USE_ASAN + result << " -fno-omit-frame-pointer" if USE_ASAN result << " -fno-optimize-sibling-calls" if USE_ASAN && PlatformInfo.cxx_supports_fno_optimize_sibling_calls_flag? result << " -DPASSENGER_DISABLE_THREAD_LOCAL_STORAGE" if !boolean_option('PASSENGER_THREAD_LOCAL_STORAGE', true) result