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

Update fastcomp_build_bin_dir() to understand new LLVM 3.5 build output directory structure, which has changed from LLVM 3.4.

Browse Source
This commit is contained in:
Jukka Jylänki
2015-01-13 13:33:13 +02:00
parent 7f57edd02e
commit b79fb12ec7
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
emsdk
View File

@@ -411,7 +411,12 @@ 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:
return os.path.join(build_dir, 'bin\\RelWithDebInfo') old_llvm_bin_dir = os.path.join(build_dir, 'bin\\RelWithDebInfo')
new_llvm_bin_dir = os.path.join(build_dir, 'RelWithDebInfo\\bin')
if os.path.exists(os.path.join(tool.install_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
return new_llvm_bin_dir
else: else:
return os.path.join(build_dir, 'bin') return os.path.join(build_dir, 'bin')