diff options
| author | Arthur Laurent <[email protected]> | 2024-02-02 18:30:05 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-02 18:30:05 +0100 |
| commit | 05deea2df8d17cfae17694b7e5cc78213c068ea4 (patch) | |
| tree | 8b86aab514f3b36826068efcf7de3571dcd4bd71 /tests/projects/c++ | |
| parent | aedc8fa8b17560952782e8409fb41937fa781486 (diff) | |
| parent | 48be7cd276d22c5cc16058fe328741c7ebd471d1 (diff) | |
Merge branch 'modules' into optimise-dag
Diffstat (limited to 'tests/projects/c++')
| -rw-r--r-- | tests/projects/c++/modules/test_stdmodules.lua | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tests/projects/c++/modules/test_stdmodules.lua b/tests/projects/c++/modules/test_stdmodules.lua index 222ec9458..c408c1d08 100644 --- a/tests/projects/c++/modules/test_stdmodules.lua +++ b/tests/projects/c++/modules/test_stdmodules.lua @@ -13,15 +13,15 @@ end function main(t) if is_subhost("windows") then - -- local clang = find_tool("clang", {version = true}) - -- if clang and clang.version and semver.compare(clang.version, "18.0") >= 0 then + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "18.0") >= 0 then + -- clang don't support msstl std modules atm -- os.exec("xmake f --toolchain=clang -c --yes") -- _build() - -- clang don't support libc++ std modules atm - -- os.exec("xmake clean -a") - -- os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes") - -- _build() - -- end + os.exec("xmake clean -a") + os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes") + _build() + end local msvc = toolchain.load("msvc") if msvc and msvc:check() then local vcvars = msvc:config("vcvars") @@ -44,16 +44,15 @@ function main(t) -- os.exec("xmake f -c --yes") -- _build() -- end - -- local clang = find_tool("clang", {version = true}) - -- if clang and clang.version and semver.compare(clang.version, "18.0") >= 0 then + local clang = find_tool("clang", {version = true}) + if clang and clang.version and semver.compare(clang.version, "18.0") >= 0 then -- clang don't support libstdc++ std modules atm -- os.exec("xmake clean -a") -- os.exec("xmake f --toolchain=clang -c --yes") -- _build() - -- clang don't support libc++ std modules atm - -- os.exec("xmake clean -a") - -- os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes") - -- _build() - -- end + os.exec("xmake clean -a") + os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes") + _build() + end end end |