diff --git a/makefiles/instance/bundle.mk b/makefiles/instance/bundle.mk index 3afb4275f..9c95d99f9 100644 --- a/makefiles/instance/bundle.mk +++ b/makefiles/instance/bundle.mk @@ -4,10 +4,6 @@ endif .PHONY: internal-bundle-all_ internal-bundle-stage_ internal-bundle-compile -ifeq ($(call __theos_bool,$(or $($(THEOS_CURRENT_INSTANCE)_DYNAMIC_LIBRARY),$(_THEOS_TRUE))),$(_THEOS_TRUE)) -_THEOS_INTERNAL_LDFLAGS += -dynamiclib -endif - # Bundle Setup LOCAL_BUNDLE_NAME = $(or $($(THEOS_CURRENT_INSTANCE)_BUNDLE_NAME),$(THEOS_CURRENT_INSTANCE)) LOCAL_BUNDLE_EXTENSION = $(or $($(THEOS_CURRENT_INSTANCE)_BUNDLE_EXTENSION),bundle) @@ -17,6 +13,10 @@ _THEOS_SHARED_BUNDLE_BUILD_PATH = $(THEOS_OBJ_DIR)/$(_LOCAL_BUNDLE_FULL_NAME) _THEOS_SHARED_BUNDLE_STAGE_PATH = $(THEOS_STAGING_DIR)$($(THEOS_CURRENT_INSTANCE)_INSTALL_PATH)/$(_LOCAL_BUNDLE_FULL_NAME) _LOCAL_INSTANCE_TARGET := $(_LOCAL_BUNDLE_FULL_NAME)$(_THEOS_TARGET_BUNDLE_BINARY_SUBDIRECTORY)/$(THEOS_CURRENT_INSTANCE)$(TARGET_EXE_EXT) include $(THEOS_MAKE_PATH)/instance/shared/bundle.mk + +ifeq ($(call __theos_bool,$(or $($(THEOS_CURRENT_INSTANCE)_DYNAMIC_LIBRARY),$(_THEOS_TRUE))),$(_THEOS_TRUE)) +_THEOS_INTERNAL_LDFLAGS += -dynamiclib -install_name "$(THEOS_PACKAGE_INSTALL_PREFIX)$($(THEOS_CURRENT_INSTANCE)_INSTALL_PATH)/$(_LOCAL_INSTANCE_TARGET)" +endif # End Bundle Setup ifeq ($(_THEOS_MAKE_PARALLEL_BUILDING), no)