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

Remove old workaround that was there to restore %SystemRoot% in PATH on Windows systems that were affected by #4121. (#416)

Browse Source
This commit is contained in:
juj
2019-12-19 20:30:02 +02:00
committed by GitHub
parent f72c6e9dec
commit b7cde08f6c
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
emsdk.py
View File

@@ -2517,20 +2517,6 @@ def adjusted_path(tools_to_activate, log_additions=False, system_path_only=False
if current_user_path:
existing_path += ENVPATH_SEPARATOR + current_user_path
existing_path = existing_path.split(ENVPATH_SEPARATOR)
# Fix up after potential changes made by bug https://github.com/kripken/emscripten/issues/4121
system_root = os.environ['SystemRoot'].lower()
for i in range(len(existing_path)):
p = existing_path[i]
if p.lower() == system_root:
p = '%SystemRoot%'
elif (system_root + '\\system32') in p.lower():
p = '%SystemRoot%\\system32'
elif (system_root + '\\system32\\wbem') in p.lower():
p = '%SystemRoot%\\System32\\Wbem'
elif (system_root + '\\system32\\windowspowershell\v1.0') in p.lower():
p = '%SystemRoot%\\System32\\WindowsPowerShell\v1.0\\'
existing_path[i] = p
else:
existing_path = os.environ['PATH'].split(ENVPATH_SEPARATOR)
emsdk_root_path = to_unix_path(emsdk_path())