diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-10-12 17:18:11 +0200 |
|---|---|---|
| committer | Richard Levitte <richard@levitte.org> | 2016-10-13 02:24:40 +0200 |
| commit | 68f3b899105b5709b8d73265549c93a78e0f6e72 (patch) | |
| tree | 01b2736de0fcba9bb76220b5174046aed474de42 /Makefile.shared | |
| parent | e4e407fe829fb474432b62b46e18f8de8e3a1729 (diff) | |
Remove automatic RPATH
Before OpenSSL 1.1.0, binaries were installed in a non-standard
location by default, and runpath directories were therefore added in
those binaries, to make sure the executables would be able to find the
shared libraries they were linked with.
With OpenSSL 1.1.0 and on, binaries are installed in standard
directories by default, and the addition of runpath directories is
therefore not needed any more.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 075f7e2c6062a33352f570eeafe3c95e41419521)
Diffstat (limited to 'Makefile.shared')
| -rw-r--r-- | Makefile.shared | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.shared b/Makefile.shared index 77dae6e791..e82ed1d956 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -176,7 +176,7 @@ DO_GNU_SO=\ ALLSYMSFLAGS='-Wl,--whole-archive'; \ NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ $(DO_GNU_SO_COMMON) -DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)" +DO_GNU_APP=LDFLAGS="$(CFLAGS) $(LDFLAGS)" #This is rather special. It's a special target with which one can link #applications without bothering with any features that have anything to @@ -220,7 +220,7 @@ link_shlib.bsd: fi; $(LINK_SO_SHLIB) link_app.bsd: @if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \ - LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBPATH)"; \ + LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \ fi; $(LINK_APP) # For Darwin AKA Mac OS/X (dyld) @@ -352,7 +352,7 @@ link_app.alpha-osf1: @if $(DETECT_GNU_LD); then \ $(DO_GNU_APP); \ else \ - LDFLAGS="$(CFLAGS) $(LDFLAGS) -rpath $(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \ fi; \ $(LINK_APP) @@ -385,7 +385,7 @@ link_app.solaris: @ if $(DETECT_GNU_LD); then \ $(DO_GNU_APP); \ else \ - LDFLAGS="$(CFLAGS) $(LDFLAGS) -R $(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \ fi; \ $(LINK_APP) @@ -476,7 +476,7 @@ link_shlib.irix: fi; \ $(LINK_SO_SHLIB) link_app.irix: - @LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-rpath,$(LIBRPATH)"; \ + @LDFLAGS="$(CFLAGS) $(LDFLAGS)"; \ $(LINK_APP) # 32-bit PA-RISC HP-UX embeds the -L pathname of libs we link with, so @@ -514,7 +514,7 @@ link_shlib.hpux: $(LINK_SO_SHLIB) && chmod a=rx $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX link_app.hpux: @if $(DETECT_GNU_LD); then $(DO_GNU_APP); else \ - LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:,+b,$(LIBRPATH)"; \ + LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,+s,+cdp,../:,+cdp,./:"; \ fi; \ $(LINK_APP) @@ -540,7 +540,7 @@ link_shlib.aix: rm -f $(DSTDIR)/$$SHLIB$$SHLIB_SOVER 2>&1 > /dev/null ; \ $(LINK_SO_SHLIB_VIA_O) link_app.aix: - LDFLAGS="$(CFLAGS) $(LDFLAGS) -Wl,-brtl,-blibpath:$(LIBRPATH):$${LIBPATH:-/usr/lib:/lib}"; \ + LDFLAGS="$(CFLAGS) -Wl,-bsvr4 $(LDFLAGS)"; \ $(LINK_APP) |