avoid OSX build failure when there are no rpaths to remove

This commit is contained in:
Joey Hess 2017-02-14 11:44:52 -04:00
parent 7a06c91f7f
commit 25e72dd30c
No known key found for this signature in database
GPG key ID: C910D9222512E3C7

View file

@ -187,7 +187,9 @@ osxapp: Build/Standalone Build/OSXMkLibs
# Remove all RPATHs, both because this overloads the linker on # Remove all RPATHs, both because this overloads the linker on
# OSX Sierra, and to avoid the binary looking in someone's home # OSX Sierra, and to avoid the binary looking in someone's home
# directory. # 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)" rm -rf "$(OSXAPP_DEST)" "$(OSXAPP_BASE)"
install -d tmp/build-dmg install -d tmp/build-dmg