Skip to content

Commit

Permalink
Prevent bundle absolute LC_ID_DYLIB (#721)
Browse files Browse the repository at this point in the history
  • Loading branch information
L1ghtmann committed May 16, 2024
1 parent afd74e5 commit e06507d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions makefiles/instance/bundle.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit e06507d

Please sign in to comment.