summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-01-19 20:35:41 +0100
committerRichard Levitte <levitte@openssl.org>2016-01-19 20:59:26 +0100
commit930d87c1e1a34569620471b2627612d0df6270d0 (patch)
tree9f09789778eb2acb2ea6dae52e3404377e3218da
parent607e77300ead771e2a61a58df3981dad773c8f7a (diff)
Fix BSD -rpath parameter
For BSD systems, Configure adds a shared_ldflags including a reference to the Makefile variable LIBRPATH, but since it must be passed down to Makefile.shared, care must be taken so the value of LIBRPATH doesn't get expanded too early, or it ends up giving an empty string. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit c64879d3f3cc4c7f1c436a9fe3bd109847a23629)
-rwxr-xr-xConfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configure b/Configure
index f10287ea20..4a715dc437 100755
--- a/Configure
+++ b/Configure
@@ -1516,7 +1516,7 @@ if ($target =~ /\-icc$/) # Intel C compiler
# linker only when --prefix is not /usr.
if ($target =~ /^BSD\-/)
{
- $shared_ldflag.=" -Wl,-rpath,\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|);
+ $shared_ldflag.=" -Wl,-rpath,\$\$(LIBRPATH)" if ($prefix !~ m|^/usr[/]*$|);
}
if ($sys_id ne "")