From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Jan 2016 19:35:41 +0000 (+0100)
Subject: Fix BSD -rpath parameter
X-Git-Tag: OpenSSL_1_0_1r~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=126ac21c80967ec00f802d356462c1b83fa0f54c;p=oweals%2Fopenssl.git

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)
---

diff --git a/Configure b/Configure
index 84f627c23b..0a5ffac750 100755
--- a/Configure
+++ b/Configure
@@ -1449,7 +1449,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 "")