diff options
| author | Richard Levitte <[email protected]> | 2016-01-19 20:35:41 +0100 |
|---|---|---|
| committer | Richard Levitte <[email protected]> | 2016-01-19 20:59:31 +0100 |
| commit | 126ac21c80967ec00f802d356462c1b83fa0f54c (patch) | |
| tree | 2da096e184175fac59f405123b58dc157a467322 | |
| parent | Validate ClientHello session_id field length and send alert on failure (diff) | |
| download | openssl-126ac21c80967ec00f802d356462c1b83fa0f54c.tar.gz openssl-126ac21c80967ec00f802d356462c1b83fa0f54c.zip | |
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 <[email protected]>
(cherry picked from commit c64879d3f3cc4c7f1c436a9fe3bd109847a23629)
| -rwxr-xr-x | Configure | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Configure b/Configure index 84f627c23b0..0a5ffac750f 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 "") |