Merge pull request #3255 from Arthapz/improve-clang-modules-support-with-libc++

improve clang libc++ module support

1 files changed, 11 insertions, 4 deletions

diff --git a/tests/projects/c++/modules/test_headerunits.lua b/tests/projects/c++/modules/test_headerunits.lua
index 78c999497..6a942e583 100644
--- a/tests/projects/c++/modules/test_headerunits.lua
+++ b/tests/projects/c++/modules/test_headerunits.lua
@@ -25,10 +25,17 @@ function main(t)
             _build()
         end
         local clang = find_tool("clang", {version = true})
-        if clang and clang.version and semver.compare(clang.version, "16.0") >= 0 then
-            os.exec("xmake clean -a")
-            os.exec("xmake f --toolchain=clang -c --yes")
-            _build()
+        if clang and clang.version then
+            if semver.compare(clang.version, "15.0") >= 0 then
+                os.exec("xmake clean -a")
+                os.exec("xmake f --toolchain=clang -c")
+                _build()
+            -- elseif semver.compare(clang.version, "15.0") >= 0 then
+            -- there is currently a bug on llvm git that prevent to build STL header units https://github.com/llvm/llvm-project/issues/58540
+            -- os.exec("xmake clean -a")
+            -- os.exec("xmake f --toolchain=clang --cxxflags=\"-stdlib=libc++\" -c")
+            -- _build()
+            end
         end
     end
 end