Merge branch 'master' into vs2017

emsdk

@@ -35,16 +35,16 @@ if os.name == 'nt':
   WINDOWS = True
   ENVPATH_SEPARATOR = ';'
 
-LINUX = False
-if platform.system() == 'Linux' or os.name == 'posix':
-  LINUX = True
-  ENVPATH_SEPARATOR = ':'
-
 OSX = False
 if platform.mac_ver()[0] != '':
   OSX = True
   ENVPATH_SEPARATOR = ':'
 
+LINUX = False
+if not OSX and (platform.system() == 'Linux' or os.name == 'posix'):
+  LINUX = True
+  ENVPATH_SEPARATOR = ':'
+
 CPU_CORES = max(multiprocessing.cpu_count()-1, 1) # Don't saturate all cores to not steal the whole system, but be aggressive.
 
 CMAKE_BUILD_TYPE_OVERRIDE = None
@@ -1530,7 +1530,6 @@ def update_emsdk():
     print('You seem to have bootstrapped Emscripten SDK by cloning from GitHub. In this case, use "git pull" instead of "emsdk update" to update emsdk. (Not doing that automatically in case you have local changes)', file=sys.stderr)
     print('Alternatively, use "emsdk update-tags" to refresh the latest list of tags from the different Git repositories.', file=sys.stderr)
     sys.exit(1)
-  sys.exit(0)
   if WINDOWS:
     download_and_unzip(urljoin(emsdk_packages_url, 'emsdk_windows_update.zip'), emsdk_path(), download_even_if_exists=True)
     rmfile('zips/emsdk_windows_update.zip')