source: issm/oecreview/Archive/21724-22754/ISSM-21928-21929.diff@ 22755

../trunk-jpl/jenkins/jenkins.sh

@@ -181 +181 @@
         exit 1;
 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
 CC_PREVIOUS=$CC
@@ -187 +195 @@
 if [ $JAVASCRIPT_TEST -eq 1 ]; then
         export CXX=em++
         export CC=emcc
+        source $ISSM_DIR/externalpackages/emscripten/src/emsdk_env.sh
 fi
-
-source $ISSM_DIR/etc/environment.sh
-
-if [ "$OS" == "win" ]; then
-        echo " == WINDOWS ENVIRONMENT DETECTED =="
-        source $ISSM_DIR/externalpackages/windows/windows_environment.sh
-fi
 #}}}
 #ISSM compilation yes/no                (ISSM_COMPILATION) {{{
 if [ "$ISSM_COMPILATION" == "yes" ]