From 126ac21c80967ec00f802d356462c1b83fa0f54c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 19 Jan 2016 20:35:41 +0100 Subject: [PATCH] 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 (cherry picked from commit c64879d3f3cc4c7f1c436a9fe3bd109847a23629) --- Configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 "") -- 2.25.1