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

deploy: remove some tools when cross-compiling for macOS #29890

Merged
merged 3 commits into from
Apr 25, 2024
Merged

deploy: remove some tools when cross-compiling for macOS #29890

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78b6b5c
build: don't pass strip to macOS deploy if cross-compiling
fanquake Apr 15, 2024
3bee514
build: don't use install_name_tool for macOS deploy when cross-compiling
fanquake Apr 15, 2024
1a9aa8d
build: better scope usage of -Wl,-headerpad_max_install_names
fanquake Apr 16, 2024
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
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ $(OSX_ZIP): deploydir
cd $(APP_DIST_DIR) && find . | sort | $(ZIP) -X@ $@

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALL_NAME_TOOL=$(INSTALL_NAME_TOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
INSTALL_NAME_TOOL=$(INSTALL_NAME_TOOL) OTOOL=$(OTOOL) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

78b6b5c: note for other reviewers

BUILD_OS is set to darwin when either (see configure.ac):

  1. we're not cross-compiling and TARGET_OS=darwin; or
  2. we are cross-compiling and $build_os=darwin

BUILD_DARWIN is set when [test "$BUILD_OS" = "darwin"]. So the !BUILD_DARWIN code path here is taken when we are cross compiling (from a non-darwin system).

After this commit $STRIP is only used for Windows stuff.

It's not clear to me what $STRIP is/was doing. So I'll just check if this PR doesn't break anything for me.


deploydir: $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
endif !BUILD_DARWIN
Expand Down