Changeset 21929

Timestamp:

08/09/17 18:59:19 (8 years ago)

Author:

dlcheng

Message:

CHG: Sourcing emscripten envvars during jeknins JS compilation.

File:

• issm/trunk-jpl/jenkins/jenkins.sh (modified) (2 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -182 +182 @@
 fi
 
+
+source $ISSM_DIR/etc/environment.sh
+
+if [ "$OS" == "win" ]; then
+        echo " == WINDOWS ENVIRONMENT DETECTED =="
+        source $ISSM_DIR/externalpackages/windows/windows_environment.sh
+fi
+
 #Set CXX/CC flags for JS runs after exnteralpackages to avoid conflicts during their compilation
 CXX_PREVIOUS=$CXX
@@ -188 +196 @@
         export CXX=em++
         export CC=emcc
-fi
-
-source $ISSM_DIR/etc/environment.sh
-
-if [ "$OS" == "win" ]; then
-        echo " == WINDOWS ENVIRONMENT DETECTED =="
-        source $ISSM_DIR/externalpackages/windows/windows_environment.sh
+        source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
 fi
 #}}}