Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent bundle absolute LC_ID_DYLIB #721

Merged
merged 6 commits into from
May 16, 2024
Merged

Prevent bundle absolute LC_ID_DYLIB #721

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e91b08
Use relative path for bundles (prevents absolute LC_ID_DYLIB)
L1ghtmann Apr 14, 2023
2a9c700
Add @rpath only if building for supported ver
L1ghtmann Apr 21, 2023
dc80e33
Use full bundle path instead of @rpath
L1ghtmann Nov 8, 2023
44737c0
Merge branch 'master' of https://github.com/theos/theos into rel-bund…
L1ghtmann Dec 6, 2023
a8eb4d5
Don't include package install prefix in install name as handled by sc…
L1ghtmann Dec 6, 2023
0ff379c
Revert "Don't include package install prefix in install name as handl…
L1ghtmann Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions makefiles/instance/bundle.mk
View file
Open in desktop
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