diff options
| author | Peter Eisentraut | 2003-01-05 13:45:47 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2003-01-05 13:45:47 +0000 |
| commit | 1bf1597e3ac2b2c664aebc56aaab5bd78fd48a50 (patch) | |
| tree | 48fff59aa8d2968c6cb77eb98c7fe25211e31902 /src/makefiles | |
| parent | a60f9db508014c705ed2624cffa424d04549fb77 (diff) | |
Revert rpath-mangling patch. See discussion on -patches around Nov 29 for
the rationale.
Diffstat (limited to 'src/makefiles')
| -rw-r--r-- | src/makefiles/Makefile.unixware | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware index 6b37982290..9e4d715932 100644 --- a/src/makefiles/Makefile.unixware +++ b/src/makefiles/Makefile.unixware @@ -7,23 +7,9 @@ endif ifeq ($(ld_R_works), yes) ifeq ($(with_gnu_ld), yes) - # Convert the list of library search paths into -rpath options - # (i.e. "-LpathA -LpathB" -> ",-rpath,pathA,-rpath,pathB"), adding - # the contents of LD_LIBRARY_PATH if it exists. - tpath1=$(shell echo $(trpath) | sed -e 's/ *-L/,-rpath,/g') -ifdef LD_LIBRARY_PATH - tpath2 = ,-rpath,$(shell echo $(LD_LIBRARY_PATH) | sed -e 's/:/,-rpath,/g') -endif - rpath = -Wl,-rpath,$(libdir)$(tpath)$(tpath2) + rpath = -Wl,-rpath,$(libdir) else - # Convert the list of library search paths into a -R option path - # (i.e. "-LpathA -LpathB" -> ":pathA:pathB"), adding the contents of - # LD_LIBRARY_PATH if it exists. - tpath1 = $(shell echo $(trpath) | sed -e 's/ *-L/:/g') -ifdef LD_LIBRARY_PATH - tpath2 = :$(LD_LIBRARY_PATH) -endif - rpath = -Wl,-R$(libdir)$(tpath1)$(tpath2) + rpath = -Wl,-R$(libdir) endif endif shlib_symbolic = -Wl,-Bsymbolic |