Merge pull request #54578 from alyssais/gcj-darwin

gcj: fix build on Darwin
2019-02-08 16:54:35 +00:00
parent fd16049d7d b9b83748f3
commit 21d991b1fd
2 changed files with 24 additions and 12 deletions
@@ -23,7 +23,14 @@ fixDarwinDylibNames() {
    for fn in "$@"; do
        if [ -L "$fn" ]; then continue; fi
        echo "$fn: fixing dylib"
-        install_name_tool -id "$fn" "${flags[@]}" "$fn"
+        int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1)
+        result=$?
+        if [ "$result" -ne 0 ] &&
+            ! grep "shared library stub file and can't be changed" <<< "$out"
+        then
+            echo "$int_out" >&2
+            exit "$result"
+        fi
    done
 }