diff --git a/emsdk b/emsdk
index 26690a4..4448e7c 100755
--- a/emsdk
+++ b/emsdk
@@ -413,8 +413,8 @@ 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:
-    old_llvm_bin_dir = os.path.join(build_dir, 'bin\\RelWithDebInfo')
-    new_llvm_bin_dir = os.path.join(build_dir, 'RelWithDebInfo\\bin')
+    old_llvm_bin_dir = os.path.join(build_dir, 'bin\\' + tool.cmake_build_type)
+    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)):
       return new_llvm_bin_dir
     if os.path.exists(os.path.join(tool.install_path, old_llvm_bin_dir)): return old_llvm_bin_dir