From 4fc43e7b78051eadccc366c4a5c0bdfae82b0843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jukka=20Jyl=C3=A4nki?= Date: Thu, 2 Jul 2015 22:11:24 +0300 Subject: [PATCH] Fix fastcomp_build_bin_dir() on Windows. --- emsdk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emsdk b/emsdk index 791ce27..507fddd 100755 --- a/emsdk +++ b/emsdk @@ -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')