diff options
| author | Arthur LAURENT <[email protected]> | 2023-01-11 15:38:52 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2023-01-11 16:46:04 +0100 |
| commit | a70a59a68f39d9c9ba3538baa94dcce6132f1241 (patch) | |
| tree | 4de994fed1977ca48369f4f5b18fe2ae00f414df | |
| parent | 429ff39f5874e63741aecbe3dfdc15d790e0fb44 (diff) | |
cleanup
| -rw-r--r-- | tests/projects/c++/modules/stl_headerunit/xmake.lua | 1 | ||||
| -rw-r--r-- | tests/projects/c++/modules/stl_headerunit_cpp_only/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/c++/modules/modules_support/clang.lua | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/tests/projects/c++/modules/stl_headerunit/xmake.lua b/tests/projects/c++/modules/stl_headerunit/xmake.lua index b73913a87..55d55a5fd 100644 --- a/tests/projects/c++/modules/stl_headerunit/xmake.lua +++ b/tests/projects/c++/modules/stl_headerunit/xmake.lua @@ -5,4 +5,3 @@ target("stl_headerunit") set_kind("binary") add_files("src/*.cpp", "src/*.mpp") - set_values("c++.clang.modules.strict", true) -- clang std module clash with stl header units or c++23 std module so we disable it
\ No newline at end of file diff --git a/tests/projects/c++/modules/stl_headerunit_cpp_only/xmake.lua b/tests/projects/c++/modules/stl_headerunit_cpp_only/xmake.lua index 7b8a04f2e..97a260e1e 100644 --- a/tests/projects/c++/modules/stl_headerunit_cpp_only/xmake.lua +++ b/tests/projects/c++/modules/stl_headerunit_cpp_only/xmake.lua @@ -5,4 +5,4 @@ target("stl_headerunit_cpp_only") set_kind("binary") add_files("src/*.cpp") set_policy("build.c++.modules", true) - set_values("c++.clang.modules.strict", true) -- clang std module clash with stl header units or c++23 std module so we disable it + diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua index 19f6968c6..74b2f62cc 100644 --- a/xmake/rules/c++/modules/modules_support/clang.lua +++ b/xmake/rules/c++/modules/modules_support/clang.lua @@ -298,7 +298,7 @@ function generate_dependencies(target, sourcebatch, opt) end end - assert(not (has_std_modules and target:values("c++.clang.modules.strict")), + assert(not (has_std_modules and not target:values("c++.clang.modules.stdmodules")), [[On llvm <= 16 standard C++ modules are not supported ; they can be emulated through clang modules and supported only on libc++ ; please add -stdlib=libc++ cxx flag or disable strict mode]]) |