avoid OSX build failure when there are no rpaths to remove
authorJoey Hess <joeyh@joeyh.name>
Tue, 14 Feb 2017 15:44:52 +0000 (11:44 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 14 Feb 2017 15:44:52 +0000 (11:44 -0400)
Makefile

index cc254c438dc1d137433a9ad5b475354a4a7e9aad..ec5fcf2462b17c7ae23392b33468bbf34e7a01be 100644 (file)
--- 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