[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c64879d3f3cc4c7f1c436a9fe3bd109847a23629 (commit)
      from  928623825cc59e272e2031cd3f07c5b7bbd605d4 (commit)


- Log -----------------------------------------------------------------
commit c64879d3f3cc4c7f1c436a9fe3bd109847a23629
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jan 19 20:35:41 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Configure b/Configure
index 30e90b7..330748b 100755
--- a/Configure
+++ b/Configure
@@ -1737,7 +1737,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 "")