add existence check for clang lib dir and improve on x86

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 2c603b3541e21e713a3891a9929dcf48c6a47cde..3724878758cd17f94a20d34a986e2f5a1b91b2e7 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -3388,11 +3388,23 @@ function get_clang_lib_dir()
                ERROR("Faled to determine clang lib path");
        }
 
-       /* FIXME existence check, etc. */
        if (X64) {
                ret = PROGRAM_FILES + "\\LLVM\\lib\\clang\\" + ver + "\\lib";
+               if (!FSO.FolderExists(ret)) {
+                       ret = null;
+               }
        } else {
                ret = PROGRAM_FILESx86 + "\\LLVM\\lib\\clang\\" + ver + "\\lib";
+               if (!FSO.FolderExists(ret)) {
+                       ret = PROGRAM_FILES + "\\LLVM\\lib\\clang\\" + ver + "\\lib";
+                       if (!FSO.FolderExists(ret)) {
+                               ret = null;
+                       }
+               }
+       }
+
+       if (null == ret) {
+               ERROR("Invalid clang lib path encountered");
        }
 
        return ret;