From b79fb12ec7c5cb3d9c1ad14e9fff7870754a6d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Tue, 13 Jan 2015 13:33:13 +0200 Subject: [PATCH] Update fastcomp_build_bin_dir() to understand new LLVM 3.5 build output directory structure, which has changed from LLVM 3.4. --- emsdk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emsdk b/emsdk index 597f026..4e48f13 100755 --- a/emsdk +++ b/emsdk @@ -411,7 +411,12 @@ def fastcomp_build_dir(tool): def fastcomp_build_bin_dir(tool): build_dir = fastcomp_build_dir(tool) 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: return os.path.join(build_dir, 'bin')