diff options
| author | ruki <[email protected]> | 2024-12-31 23:03:18 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-31 23:03:18 +0800 |
| commit | 686b414c97f5fae095676d06fbf62ddc3d0bb36f (patch) | |
| tree | 046f89786c96bbe00060e8c8ad3ff434bab05d4d | |
| parent | 6739b29e01de42b090efdd5470c0fd9bea4bf09b (diff) | |
| parent | 87832f6b0234b8afefab57a13e5325a68e55c01e (diff) | |
Merge pull request #6022 from xmake-io/envs
Improve envs toolchain
| -rw-r--r-- | xmake/core/base/linuxos.lua | 2 | ||||
| -rw-r--r-- | xmake/toolchains/envs/xmake.lua | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/xmake/core/base/linuxos.lua b/xmake/core/base/linuxos.lua index a397d95fe..46d3c010a 100644 --- a/xmake/core/base/linuxos.lua +++ b/xmake/core/base/linuxos.lua @@ -98,7 +98,7 @@ function linuxos.name() elseif os_release:find("linux mint", 1, true) or os_release:find("linuxmint", 1, true) then name = "linuxmint" -- kylin contains keyword 'UBUNTU_CODENAME', so we check kylin before ubuntu - elseif os_release:find("kylin", 1, true) then + elseif os_release:find("kylin", 1, true) then name = "kylin" elseif os_release:find("ubuntu", 1, true) then name = "ubuntu" diff --git a/xmake/toolchains/envs/xmake.lua b/xmake/toolchains/envs/xmake.lua index b40cf6166..1db838903 100644 --- a/xmake/toolchains/envs/xmake.lua +++ b/xmake/toolchains/envs/xmake.lua @@ -18,17 +18,13 @@ -- @file xmake.lua -- --- define toolchain toolchain("envs") - - -- set description set_description("Environment variables toolchain") - -- set toolset set_toolset("cc", "$(env CC)") set_toolset("cxx", "$(env CXX)") - set_toolset("ld", "$(env LD)", "$(env CXX)") - set_toolset("sh", "$(env SH)", "$(env LD)", "$(env CXX)") + set_toolset("ld", "$(env CXX)", "$(env CC)", "$(env LD)") + set_toolset("sh", "$(env CXX)", "$(env CC)", "$(env SH)", "$(env LD)") set_toolset("ar", "$(env AR)") set_toolset("strip", "$(env STRIP)") set_toolset("ranlib","$(env RANLIB)") |