diff options
| author | Saikari <[email protected]> | 2026-02-20 01:02:05 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-02-20 01:02:05 +0300 |
| commit | bff076bc40ff224aad1f6a1b0c6c978e7d6b7313 (patch) | |
| tree | 542441bb1ea8b829478a8eb8e00f324db7013c72 /tests/projects/c++ | |
| parent | b065878db47435b7ebfa9f29020c927b4eff8f7e (diff) | |
| parent | 23c62e6d3d3b91133221abe4946a5aacc298a836 (diff) | |
Merge branch 'xmake-io:dev' into sign
Diffstat (limited to 'tests/projects/c++')
| -rw-r--r-- | tests/projects/c++/linkorders/test.lua | 3 | ||||
| -rw-r--r-- | tests/projects/c++/snippet_runtimes/test.lua | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/projects/c++/linkorders/test.lua b/tests/projects/c++/linkorders/test.lua index 39898ef97..7728aa73a 100644 --- a/tests/projects/c++/linkorders/test.lua +++ b/tests/projects/c++/linkorders/test.lua @@ -1,7 +1,7 @@ function main(t) -- freebsd ci is slower - if is_host("bsd", "solaris") then + if is_host("bsd", "solaris", "haiku") then return end @@ -10,4 +10,3 @@ function main(t) t:build() end end - diff --git a/tests/projects/c++/snippet_runtimes/test.lua b/tests/projects/c++/snippet_runtimes/test.lua index e06f405f7..c20ec10ff 100644 --- a/tests/projects/c++/snippet_runtimes/test.lua +++ b/tests/projects/c++/snippet_runtimes/test.lua @@ -12,7 +12,7 @@ end function main(t) local clang = find_tool("clang") - if clang and not is_subhost("windows") and not is_subhost("bsd", "solaris") then + if clang and not is_subhost("windows") and not is_subhost("bsd", "solaris", "haiku") then os.exec("xmake f --toolchain=clang --runtimes=c++_shared --yes") _build() end |