diff --git a/mac/build.sh b/mac/build.sh
index aa33f4128c..fbca48bd05 100755
--- a/mac/build.sh
+++ b/mac/build.sh
@@ -105,14 +105,13 @@ BUILD_OPTIONS="-configuration $CONFIG $BUILD_OPTIONS PRODUCT_VERSION=$VERSION"
 execBuildCommand() {
     declare -r component="$1"
     shift
-    typeset cmnd="$*"
-    typeset ret_code
+    declare -r cmnd="$*"
 
     displayInfo "Building $component:" "$cmnd"
     set +e
-    eval "$cmnd"
-    ret_code=$?
-    set -e
+    local ret_code=0
+    eval "$cmnd" || ret_code=$?
+    set -ex
 
     printXCodeBuildScriptLogs