From 4de51768d9633fcef3c46e6c439892fd752d83b6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 7 Nov 2016 14:21:30 -0400 Subject: OSX: Remove RPATHs from git-annex binary, which are not needed, slow down startup, and break the OSX Sierra linker. ghc 8.0.2 may make this unncessary, but it's not in a stackage version yet, so put in a workaround. Note that the linux builds already delete the RPATHs for similar reasons. This commit was sponsored by Josh Taylor on Patreon. --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e2413f3c7..e05546c52 100644 --- a/Makefile +++ b/Makefile @@ -181,6 +181,11 @@ OSXAPP_BASE=$(OSXAPP_DEST)/Contents/MacOS/bundle osxapp: Build/Standalone Build/OSXMkLibs $(MAKE) git-annex + # Remove all RPATHs, both because this overloads the linker on + # OSX Sierra, and to avoid the binary looking in someone's home + # directory. + eval install_name_tool $$(otool -l git-annex | grep "path " | sed 's/.*path /-delete_rpath /' | sed 's/ (.*//') git-annex + rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)" install -d tmp/build-dmg cp -R standalone/osx/git-annex.app "$(OSXAPP_DEST)" -- cgit v1.2.3