Fixed for projects using Xcode New Build System

Author: jonreid

CHANGELOG.md

@@ -1,3 +1,9 @@
+NEXT RELEASE
+------------
+
+* Fixed for projects using Xcode "New Build System"
+
+
 Version 1.3.1
 -------------
 _24 Sep 2017_

envcov.sh

@@ -5,10 +5,18 @@
 scripts="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${scripts}/env.sh"
 
+# For New Build System, hard-code to 64-bit simulator
+if [ ${CURRENT_ARCH}  = "undefined_arch" ]
+then
+    ARCHITECTURE="x86_64"
+else
+    ARCHITECTURE=${CURRENT_ARCH}
+fi
+
 LCOV_PATH="${scripts}/lcov-1.13/bin"
-OBJ_DIR="${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}"
+OBJ_DIR="${OBJECT_FILE_DIR_normal}/${ARCHITECTURE}"
 
 # Fix for the new LLVM-COV that requires gcov to have a -v parameter
 LCOV() {
-	"${LCOV_PATH}/lcov" "$@" --gcov-tool "${scripts}/llvm-cov-wrapper.sh"
+    "${LCOV_PATH}/lcov" "$@" --gcov-tool "${scripts}/llvm-cov-wrapper.sh"
 }