diff options
Diffstat (limited to 'external/firebird/firebird-rpath.patch.0')
-rw-r--r-- | external/firebird/firebird-rpath.patch.0 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/external/firebird/firebird-rpath.patch.0 b/external/firebird/firebird-rpath.patch.0 index a92f0064b20f..a730e72a84b1 100644 --- a/external/firebird/firebird-rpath.patch.0 +++ b/external/firebird/firebird-rpath.patch.0 @@ -1,11 +1,11 @@ --- builds/posix/make.defaults +++ builds/posix/make.defaults -@@ -255,7 +255,7 @@ +@@ -279,7 +279,7 @@ - LIB_PLATFORM_RPATH = -Wl,-rpath,$(1) - ifeq ($(strip @BINRELOC_CFLAGS@),) --LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@)) -+LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN') - else - LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$$$ORIGIN/../$(1)') - endif + ifeq (@USE_RPATH@,1) + ifeq ($(strip @BINRELOC_CFLAGS@),) +- LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),@FB_LIBDIR@,@FB_INTLDIR@)) ++ LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN') + else + LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,'$$ORIGIN/../$(1)') + endif |