diff options
| author | ruki <[email protected]> | 2021-02-08 23:24:25 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-08 23:24:25 +0800 |
| commit | b4420e51c372cd46367852a354855555b044b21c (patch) | |
| tree | d146572d440f815dccfc0df938b7b60c50e800bd /tests/projects | |
| parent | 21f54de18ca93ef952e5c5711fa491330cf9f49f (diff) | |
support toolchain@packages syntax
Diffstat (limited to 'tests/projects')
5 files changed, 7 insertions, 6 deletions
diff --git a/tests/projects/package/toolchain_gnu_rm/xmake.lua b/tests/projects/package/toolchain_gnu_rm/xmake.lua index d00bc859c..0857f6b90 100644 --- a/tests/projects/package/toolchain_gnu_rm/xmake.lua +++ b/tests/projects/package/toolchain_gnu_rm/xmake.lua @@ -4,4 +4,4 @@ add_requires("gnu-rm") target("test") set_kind("binary") add_files("src/*.c") - set_toolchains("gnu-rm") + set_toolchains("@gnu-rm") diff --git a/tests/projects/package/toolchain_llvm/xmake.lua b/tests/projects/package/toolchain_llvm/xmake.lua index 5e2f17b3c..974430856 100644 --- a/tests/projects/package/toolchain_llvm/xmake.lua +++ b/tests/projects/package/toolchain_llvm/xmake.lua @@ -4,4 +4,4 @@ add_requires("llvm 11.0.0", {alias = "llvm-11"}) target("test") set_kind("binary") add_files("src/*.c") - set_toolchains("llvm", {packages = "llvm-11"}) + set_toolchains("llvm@llvm-11") diff --git a/tests/projects/package/toolchain_llvm_mingw/xmake.lua b/tests/projects/package/toolchain_llvm_mingw/xmake.lua index 0373bd96b..da5c71225 100644 --- a/tests/projects/package/toolchain_llvm_mingw/xmake.lua +++ b/tests/projects/package/toolchain_llvm_mingw/xmake.lua @@ -4,4 +4,4 @@ add_requires("llvm-mingw") target("test") set_kind("binary") add_files("src/*.c") - set_toolchains("mingw") + set_toolchains("mingw@llvm-mingw") diff --git a/tests/projects/package/toolchain_muslcc/xmake.lua b/tests/projects/package/toolchain_muslcc/xmake.lua index 9bfa0de28..688cb241c 100644 --- a/tests/projects/package/toolchain_muslcc/xmake.lua +++ b/tests/projects/package/toolchain_muslcc/xmake.lua @@ -2,10 +2,10 @@ add_rules("mode.debug", "mode.release") -- set muslcc as global toolchain add_requires("muslcc") -set_toolchains("muslcc") +set_toolchains("@muslcc") -- explicitly specify the package toolchain -add_requires("zlib", {configs = {toolchains = "muslcc"}}) +add_requires("zlib", {configs = {toolchains = "@muslcc"}}) -- use global toolchain: muslcc add_requires("pcre2") diff --git a/tests/projects/package/toolchain_zig/xmake.lua b/tests/projects/package/toolchain_zig/xmake.lua index 095e2cba0..330c09640 100644 --- a/tests/projects/package/toolchain_zig/xmake.lua +++ b/tests/projects/package/toolchain_zig/xmake.lua @@ -3,5 +3,6 @@ add_requires("zig 0.7.x") target("test") set_kind("binary") - add_files("src/*.zig") -- we use builtin zig toolchain + add_files("src/*.zig") + set_toolchains("@zig") |