diff --git a/src/clangcxx/xmake.lua b/src/clangcxx/xmake.lua
index d75363925..3296e367b 100644
--- a/src/clangcxx/xmake.lua
+++ b/src/clangcxx/xmake.lua
@@ -6,11 +6,15 @@ if not is_mode("debug") then
     set_pcxxheader("src/pch.h")
     add_headerfiles("../../include/luisa/clangcxx/**.h")
     add_files("src/**.cpp")
-    add_linkdirs("llvm/lib")
-    add_includedirs("llvm/include")
     on_load(function(target, opt)
         local libs = {}
-        local p = "$(scriptdir)/llvm/lib/*.lib"
+        local llvm_path = get_config("llvm_path")
+        if (not llvm_path) or (llvm_path == "") then
+            llvm_path = path.join(os.scriptdir(), "llvm")
+        end
+        local p = path.join(llvm_path, "lib/*.lib")
+        target:add("linkdirs", path.join(llvm_path, "lib"))
+        target:add("includedirs", path.join(llvm_path, "include"))
         for __, filepath in ipairs(os.files(p)) do
             local basename = path.basename(filepath)
             table.insert(libs, basename)
diff --git a/src/ext/imgui b/src/ext/imgui
index 109dd2be5..8679cfa2d 160000
--- a/src/ext/imgui
+++ b/src/ext/imgui
@@ -1 +1 @@
-Subproject commit 109dd2be5d94774da25c29c1d5db8c5c0858ed99
+Subproject commit 8679cfa2d88ca8c11b96706272d73f3f567b1bb9
diff --git a/src/ext/xxHash b/src/ext/xxHash
index 51fa4ef15..de9d65779 160000
--- a/src/ext/xxHash
+++ b/src/ext/xxHash
@@ -1 +1 @@
-Subproject commit 51fa4ef15138fcaf1b09717bbcdee5460bef58f8
+Subproject commit de9d6577907d4f4f8153e96b0cb0cbdf7df649bb
diff --git a/xmake.lua b/xmake.lua
index 5f235fef6..afc1ba9a7 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -152,6 +152,10 @@ set_values(true, false)
 set_default(false)
 set_showmenu(true)
 option_end()
+option("llvm_path")
+set_default(false)
+set_showmenu(true)
+option_end()
 -- pre-defined options end
 
 -- use xrepo from skr