Fix monolith build

lloeki · lloeki · commit bef157d8e062 · 2020-10-29T15:14:08.000+01:00
diff --git a/build-monolith b/build-monolith
@@ -15,29 +15,33 @@ cd "out/${BUILDTYPE}/obj.target"
 
 platform=$(uname)
 
-rm -vf "${LIBV8_MONOLITH}"
+rm -f "${LIBV8_MONOLITH}"
 case "${platform}" in
     "SunOS")
-        /usr/xpg4/bin/find . -path "**/v8*/**/*.o" | xargs ar cqs "${LIBV8_MONOLITH}"
-        /usr/xpg4/bin/find . -path "**/icu*/**/*.o" | xargs ar cqs "${LIBV8_MONOLITH}"
+        /usr/xpg4/bin/find . -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | while read -r obj; do
+            xargs ar cqS "${LIBV8_MONOLITH}" "${obj}"
+        done
+        ranlib "${LIBV8_MONOLITH}"
         ;;
     "Darwin")
-        #/usr/bin/find . -path "**/v8*/**/*.o" | xargs ar -q "${LIBV8_MONOLITH}"
-        #/usr/bin/find . -path "**/icu*/**/*.o" | xargs ar -q "${LIBV8_MONOLITH}"
-        /usr/bin/find . -path "**/v8*/**/*.o" -or -path "**/icu*/**/*.o" | sort | uniq | xargs ar -q "${LIBV8_MONOLITH}"
+        /usr/bin/find . -path "./v8*/**/*.o" -or -path "./icu*/**/*.o" | sort | uniq | while read -r obj; do
+            /usr/bin/ar -cqS "${LIBV8_MONOLITH}" "${obj}"
+        done
+        /usr/bin/ranlib "${LIBV8_MONOLITH}"
         ;;
     "Linux")
-        find . -path './deps/v8/gypfiles/*.a' | while read -r lib; do
-          ar -t "${lib}" | xargs ar -q "${LIBV8_MONOLITH}"
+        find . -path './tools/v8/gypfiles/*.a' | while read -r lib; do
+          ar -t "${lib}" | xargs ar -cqS "${LIBV8_MONOLITH}"
         done
         find . -path './tools/icu/*.a' | while read -r lib; do
-          ar -t "${lib}" | xargs ar -q "${LIBV8_MONOLITH}"
+          ar -t "${lib}" | xargs ar -cqS "${LIBV8_MONOLITH}"
         done
+        ranlib "${LIBV8_MONOLITH}"
         ;;
     *)
       echo "Unsupported platform: ${platform}"
       exit 1
       ;;
 esac
 
-mv -vf "${LIBV8_MONOLITH}" "${BASEDIR}/out/${BUILDTYPE}/${LIBV8_MONOLITH}"
+mv -f "${LIBV8_MONOLITH}" "${BASEDIR}/out/${BUILDTYPE}/${LIBV8_MONOLITH}"
