Commit 930d87c1 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarViktor Dukhovni <viktor@openssl.org>
(cherry picked from commit c64879d3)
parent 607e7730

Configure

+1 −1
Original line number Diff line number Diff line
@@ -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 "")