From 92aa03472f2b6f04de14a03ebd3ab83842ba1d93 Mon Sep 17 00:00:00 2001 From: Mohamed Akram Date: Sat, 18 May 2024 00:46:58 +0400 Subject: [PATCH] Fix library install name and plugin type on macOS macOS requires an absolute path in the install name. Also, use `-bundle` for plugins which is preferred for loadable modules. --- lib/libpe/Makefile | 2 +- src/plugins/Makefile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/libpe/Makefile b/lib/libpe/Makefile index edccc1c2..4c552c49 100644 --- a/lib/libpe/Makefile +++ b/lib/libpe/Makefile @@ -106,7 +106,7 @@ else ifeq ($(PLATFORM_OS), GNU/kFreeBSD) $(LINK) -shared -Wl,-soname,$(LIBNAME).so.1 $(LDFLAGS) -o $(LIBNAME).so $^ $(LIBS) else ifeq ($(PLATFORM_OS), Darwin) $(LINK) -headerpad_max_install_names -dynamiclib \ - -flat_namespace -install_name $(LIBNAME).$(VERSION).dylib \ + -flat_namespace -install_name $(libdir)/$(LIBNAME).$(VERSION).dylib \ -current_version $(VERSION) -compatibility_version $(VERSION) \ $(LDFLAGS) -o $(LIBNAME).dylib $^ $(LIBS) else ifeq ($(PLATFORM_OS), CYGWIN) diff --git a/src/plugins/Makefile b/src/plugins/Makefile index af68a86f..fe593d42 100644 --- a/src/plugins/Makefile +++ b/src/plugins/Makefile @@ -68,10 +68,8 @@ else ifeq ($(PLATFORM_OS), GNU) else ifeq ($(PLATFORM_OS), GNU/kFreeBSD) $(LINK) -shared -Wl,-soname,$(LIBNAME).so.1 $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).so $^ else ifeq ($(PLATFORM_OS), Darwin) - $(LINK) -headerpad_max_install_names -dynamiclib \ + $(LINK) -headerpad_max_install_names -bundle \ -undefined dynamic_lookup -fno-common \ - -install_name $(LIBNAME).$(VERSION).dylib \ - -current_version $(VERSION) -compatibility_version $(VERSION) \ $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).dylib $^ else ifeq ($(PLATFORM_OS), CYGWIN) $(LINK) -shared $(LDFLAGS) -o ${plugins_BUILDDIR}/$(LIBNAME).dll $^