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

Fix fastcomp_build_bin_dir() on Windows.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-07-02 22:11:24 +03:00
parent e797e5641e
commit 4fc43e7b78
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

@@ -472,9 +472,9 @@ def fastcomp_build_bin_dir(tool):
if WINDOWS and 'Visual Studio' in CMAKE_GENERATOR:
old_llvm_bin_dir = os.path.join(build_dir, 'bin\\' + decide_cmake_build_type(tool))
new_llvm_bin_dir = os.path.join(build_dir, decide_cmake_build_type(tool) + '\\bin')
if os.path.exists(os.path.join(tool.install_path, new_llvm_bin_dir)):
if os.path.exists(os.path.join(tool.installation_path(), 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.installation_path(), old_llvm_bin_dir)): return old_llvm_bin_dir
return new_llvm_bin_dir
else:
return os.path.join(build_dir, 'bin')