aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-14 11:44:52 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-14 11:44:52 -0400
commit6f4d298d9e838c14c47b4ae2111302c07907e4b9 (patch)
treeab4b6494c32acd0a72cb06f73b10c496117be120
parent028bdb50a45c76e061d9269111812a5a004e2212 (diff)
avoid OSX build failure when there are no rpaths to remove
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cc254c438..ec5fcf246 100644
--- a/Makefile
+++ b/Makefile
@@ -187,7 +187,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
# 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
+ if otool -l git-annex | grep -q "path "; then \
+ eval install_name_tool $$(otool -l git-annex | grep "path " | sed 's/.*path /-delete_rpath /' | sed 's/ (.*//') git-annex; \
+ fi
rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)"
install -d tmp/build-dmg