Allow asan, msan and ubsan to be configured with shared libraries

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 71700ece22d5c518cbb58249970b0510e4542fb0..96b6590723d1785418f460ab6d5f2791fc3cd637 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -300,7 +300,7 @@ my $default_ranlib;
 $config{fips}=0;
 
 # Top level directories to build
 $config{fips}=0;
 
 # Top level directories to build

-$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "tools", "fuzz" ];
+$config{dirs} = [ "crypto", "ssl", "engines", "apps", "test", "util", "tools", "fuzz" ];

 # crypto/ subdirectories to build
 $config{sdirs} = [
     "objects",
 # crypto/ subdirectories to build
 $config{sdirs} = [
     "objects",


@@ -780,6 +780,13 @@ foreach (@argvcopy)
                }
        }
 
                }
        }
 

+if ($libs =~ /(^|\s)-Wl,-rpath,/
+    && !$disabled{shared}
+    && !($disabled{asan} && $disabled{msan} && $disabled{ubsan})) {
+    die "***** Cannot simultaneously use -rpath, shared libraries, and\n",
+       "***** any of asan, msan or ubsan\n";
+}
+

 if ($config{fips})
        {
        delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);
 if ($config{fips})
        {
        delete $disabled{"shared"} if ($disabled{"shared"} =~ /^default/);