admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression from #76 which caused OSX to incorrectly identify as LINUX.

Browse Source
This commit is contained in:
Jukka Jylänki
2017-06-05 17:03:58 +03:00
parent 106801dd32
commit 306b5b7db9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
emsdk
View File

@@ -35,16 +35,16 @@ if os.name == 'nt':
WINDOWS = True WINDOWS = True
ENVPATH_SEPARATOR = ';' ENVPATH_SEPARATOR = ';'
LINUX = False
if platform.system() == 'Linux' or os.name == 'posix':
LINUX = True
ENVPATH_SEPARATOR = ':'
OSX = False OSX = False
if platform.mac_ver()[0] != '': if platform.mac_ver()[0] != '':
OSX = True OSX = True
ENVPATH_SEPARATOR = ':' 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. 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 CMAKE_BUILD_TYPE_OVERRIDE = None