diff options
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | external/firebird/mold.patch | 17 |
2 files changed, 18 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index c7d9a881550c..b5e7c64f12f8 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/configure-c99.patch \ external/firebird/Wincompatible-function-pointer-types.patch \ external/firebird/0001-Revert-Backported-fix-for-7122-Invalid-state-of-mapp.patch.1 \ + external/firebird/mold.patch \ )) ifeq ($(OS),WNT) diff --git a/external/firebird/mold.patch b/external/firebird/mold.patch new file mode 100644 index 000000000000..4e39f3f913ec --- /dev/null +++ b/external/firebird/mold.patch @@ -0,0 +1,17 @@ +--- builds/posix/Makefile.in.examples.before 2024-01-07 20:16:41.073172761 +0000 ++++ builds/posix/Makefile.in.examples 2024-01-07 20:17:23.768143528 +0000 +@@ -59,8 +59,13 @@ + #endif + GPRE_FLAGS= -m -z -n + +-LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl)) ++ifeq ($(PLATFORM),DARWIN) ++LIB_LINK_RPATH = + LINK_DARWIN_RPATH = -Wl,-rpath,@loader_path/../$(TARGET)/firebird ++else ++LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl)) ++LINK_DARWIN_RPATH = ++endif + LIB_LINK_MAPFILE = + + EXAMPLES_DEST= $(GEN_ROOT)/examples |