Give CC=emcc special treatment with EMSDK

Author: polytypic

commands/setup

@@ -18,8 +18,8 @@ Options:
 
   CMAKE_TOOLCHAIN_FILE=|...
 
-  CC=cc|gcc|clang|...
-  CXX=c++|g++|clang++|...
+  CC=cc|gcc|clang|emcc|...
+  CXX=c++|g++|clang++|emcc|...
 
   CLEAN=0|1
 
@@ -51,6 +51,19 @@ BUILD_DIR=".build"
 
 # Compiler
 
+if [ "$CC" = emcc ] || [ "$CXX" = emcc ]; then
+  if [ -z "$CMAKE_TOOLCHAIN_FILE" ] \
+       && [ -n "$EMSDK" ] \
+       && [ -f "$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake" ] \
+       && command -v emcc > /dev/null; then
+    CMAKE_TOOLCHAIN_FILE="$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+    CC=''
+    CXX=''
+  else
+    >&2 echo "WARNING: emcc specified, but EMSDK does not seem to be available."
+  fi
+fi
+
 if [ -n "$CMAKE_TOOLCHAIN_FILE" ]; then
   GENERATE_CMD+=("-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE")
 

travis-ci

@@ -135,9 +135,8 @@ run-tests() {
   if [ "$TRAVIS_OS_NAME" != windows ] && [ "$EMSCRIPTEN" = 1 ]; then
     folded-finish EMSCRIPTEN_INSTALL_PID
     folded "Sourcing Emscripten environment" . .build-emsdk/emsdk_env.sh
-    local EMSCRIPTEN_TOOLCHAIN_FILE="$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
     for CONFIG in Debug Release; do
-      CMAKE_BUILD_TYPE=$CONFIG CMAKE_TOOLCHAIN_FILE="$EMSCRIPTEN_TOOLCHAIN_FILE" CC='' CXX='' folded "Emscripten $CONFIG" cppsm test
+      CMAKE_BUILD_TYPE=$CONFIG CC=emcc CXX=emcc folded "Emscripten $CONFIG" cppsm test
     done
   fi
 }