The branch OpenSSL_1_1_1-stable has been updated
       via  876b7e97b848ba179c1dbe4a4a265dfffae0eba6 (commit)
      from  e93a82da60f52e6fc799323b99499ee51e8c7215 (commit)


- Log -----------------------------------------------------------------
commit 876b7e97b848ba179c1dbe4a4a265dfffae0eba6
Author: Bernd Edlinger <bernd.edlin...@hotmail.de>
Date:   Thu Aug 26 20:10:16 2021 +0200

    Fix enable-asan with C++ buildtest
    
    the following config:
    
    ./config no-shared enable-asan enable-buildtest-c++ enable-external-tests
    
    fails to build with unresolved asan symbols when linking
    test/ossl_shim/ossl_shim
    
    Fixed by passing all sanitizer-flags to cxxflags.
    
    Reviewed-by: Paul Dale <pa...@openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16434)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Configure b/Configure
index b286dd0678..faf57b155a 100755
--- a/Configure
+++ b/Configure
@@ -1304,16 +1304,19 @@ if ($disabled{"dynamic-engine"}) {
 
 unless ($disabled{asan}) {
     push @{$config{cflags}}, "-fsanitize=address";
+    push @{$config{cxxflags}}, "-fsanitize=address" if $config{CXX};
 }
 
 unless ($disabled{ubsan}) {
     # -DPEDANTIC or -fnosanitize=alignment may also be required on some
     # platforms.
     push @{$config{cflags}}, "-fsanitize=undefined", 
"-fno-sanitize-recover=all";
+    push @{$config{cxxflags}}, "-fsanitize=undefined", 
"-fno-sanitize-recover=all" if $config{CXX};
 }
 
 unless ($disabled{msan}) {
   push @{$config{cflags}}, "-fsanitize=memory";
+  push @{$config{cxxflags}}, "-fsanitize=memory" if $config{CXX};
 }
 
 unless ($disabled{"fuzz-libfuzzer"} && $disabled{"fuzz-afl"}

Reply via email to