From 306b5b7db9a62447156134cc7e03206435f2ee6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Mon, 5 Jun 2017 17:03:58 +0300 Subject: [PATCH] Fix regression from #76 which caused OSX to incorrectly identify as LINUX. --- emsdk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/emsdk b/emsdk index e177543..3cdd3fd 100755 --- a/emsdk +++ b/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