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

Fix activation of sdk-master-64bit on Windows.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-04-07 18:15:52 +03:00
parent dda257ce65
commit 4fa8dcd696
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

@@ -413,8 +413,8 @@ def fastcomp_build_dir(tool):
def fastcomp_build_bin_dir(tool): def fastcomp_build_bin_dir(tool):
build_dir = fastcomp_build_dir(tool) build_dir = fastcomp_build_dir(tool)
if WINDOWS and 'Visual Studio' in CMAKE_GENERATOR: if WINDOWS and 'Visual Studio' in CMAKE_GENERATOR:
old_llvm_bin_dir = os.path.join(build_dir, 'bin\\RelWithDebInfo') old_llvm_bin_dir = os.path.join(build_dir, 'bin\\' + tool.cmake_build_type)
new_llvm_bin_dir = os.path.join(build_dir, 'RelWithDebInfo\\bin') new_llvm_bin_dir = os.path.join(build_dir, tool.cmake_build_type + '\\bin')
if os.path.exists(os.path.join(tool.install_path, new_llvm_bin_dir)): if os.path.exists(os.path.join(tool.install_path, new_llvm_bin_dir)):
return new_llvm_bin_dir return new_llvm_bin_dir
if os.path.exists(os.path.join(tool.install_path, old_llvm_bin_dir)): return old_llvm_bin_dir if os.path.exists(os.path.join(tool.install_path, old_llvm_bin_dir)): return old_llvm_bin_dir