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

Improve emsdk on MSYS2.

Browse Source
This commit is contained in:
Jukka Jylänki
2018-05-09 09:55:19 +03:00
parent 63ccba9f63
commit a4474e59db
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
emsdk
View File

@@ -34,7 +34,7 @@ VERBOSE = bool(os.getenv('EMSDK_VERBOSE')) if os.getenv('EMSDK_VERBOSE') != None
POWERSHELL = bool(os.getenv('EMSDK_POWERSHELL')) POWERSHELL = bool(os.getenv('EMSDK_POWERSHELL'))
WINDOWS = False WINDOWS = False
if os.name == 'nt' or (os.getenv('SYSTEMROOT') != None and 'WINDOWS' in os.getenv('SYSTEMROOT')) or (os.getenv('COMSPEC') != None and 'WINDOWS' in os.getenv('COMSPEC')): if os.name == 'nt' or (os.getenv('SYSTEMROOT') != None and 'windows' in os.getenv('SYSTEMROOT').lower()) or (os.getenv('COMSPEC') != None and 'windows' in os.getenv('COMSPEC').lower()):
WINDOWS = True WINDOWS = True
ENVPATH_SEPARATOR = ';' ENVPATH_SEPARATOR = ';'
@@ -86,7 +86,7 @@ EMSDK_SET_ENV = 'emsdk_set_env.ps1' if POWERSHELL else 'emsdk_set_env.bat' if (W
# Finds the given executable 'program' in PATH. Operates like the Unix tool 'which'. # Finds the given executable 'program' in PATH. Operates like the Unix tool 'which'.
def which(program): def which(program):
def is_exe(fpath): def is_exe(fpath):
return os.path.isfile(fpath) and os.access(fpath, os.X_OK) return os.path.isfile(fpath) and (WINDOWS or os.access(fpath, os.X_OK))
fpath, fname = os.path.split(program) fpath, fname = os.path.split(program)
if fpath: if fpath: