From 4b76e33e4db51ddb0589038b7183a4dbe84a1b91 Mon Sep 17 00:00:00 2001
From: wraitii <wraitii@wildfiregames.com>
Date: Fri, 27 Nov 2020 11:00:53 +0000
Subject: [PATCH] Fix MacOS bundle build

clean-workspaces.sh now cleans SM libs, so it needs to be called before
building libraries.

Differential Revision: https://code.wildfiregames.com/D3153
This was SVN commit r24274.
---
 libraries/osx/build-osx-libs.sh       | 2 +-
 source/tools/dist/build-osx-bundle.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/osx/build-osx-libs.sh b/libraries/osx/build-osx-libs.sh
index 72087b076f..0e10ad0cf5 100755
--- a/libraries/osx/build-osx-libs.sh
+++ b/libraries/osx/build-osx-libs.sh
@@ -949,7 +949,7 @@ then
 fi
 
 # Use the regular build script for SM.
-JOBS="$JOBS" ZLIB_DIR="$ZLIB_DIR" ./build.sh
+JOBS="$JOBS" ZLIB_DIR="$ZLIB_DIR" ./build.sh || die "Error building spidermonkey"
 
 popd > /dev/null
 
diff --git a/source/tools/dist/build-osx-bundle.sh b/source/tools/dist/build-osx-bundle.sh
index b281ba4a23..b3f919ba85 100644
--- a/source/tools/dist/build-osx-bundle.sh
+++ b/source/tools/dist/build-osx-bundle.sh
@@ -85,17 +85,19 @@ BUNDLE_SHAREDSUPPORT=$BUNDLE_CONTENTS/SharedSupport
 
 # TODO: Do we really want to regenerate everything? (consider if one task fails)
 
+./clean-workspaces.sh
+
 # Build libraries against SDK
 echo "\nBuilding libraries\n"
 pushd ../../libraries/osx > /dev/null
 ./build-osx-libs.sh $JOBS --force-rebuild || die "Libraries build script failed"
 popd > /dev/null
 
-# Clean and update workspaces
+# Update workspaces
 echo "\nGenerating workspaces\n"
 
 # Pass OS X options through to Premake
-(./clean-workspaces.sh && SYSROOT="$SYSROOT" MIN_OSX_VERSION="$MIN_OSX_VERSION" ./update-workspaces.sh --macosx-bundle="$BUNDLE_IDENTIFIER" --sysroot="$SYSROOT" --macosx-version-min="$MIN_OSX_VERSION") || die "update-workspaces.sh failed!"
+(SYSROOT="$SYSROOT" MIN_OSX_VERSION="$MIN_OSX_VERSION" ./update-workspaces.sh --macosx-bundle="$BUNDLE_IDENTIFIER" --sysroot="$SYSROOT" --macosx-version-min="$MIN_OSX_VERSION") || die "update-workspaces.sh failed!"
 
 pushd gcc > /dev/null
 echo "\nBuilding game\n"