add cross and llvm toolchains

5 files changed, 210 insertions, 2 deletions

diff --git a/xmake/toolchains/cross/check.lua b/xmake/toolchains/cross/check.lua
new file mode 100644
index 000000000..6a5bd874d
--- /dev/null
+++ b/xmake/toolchains/cross/check.lua
@@ -0,0 +1,41 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check.lua
+--
+
+-- imports
+import("core.project.config")
+import("detect.sdks.find_cross_toolchain")
+
+-- check the cross toolchain
+function main(toolchain)
+
+    -- find cross toolchain
+    local cross_toolchain = find_cross_toolchain(config.get("sdk") or config.get("bin"), {bindir = config.get("bin"), cross = config.get("cross")})
+    if cross_toolchain then
+        config.set("cross", cross_toolchain.cross, {readonly = true, force = true})
+        config.set("bin", cross_toolchain.bindir, {readonly = true, force = true})
+    else
+        -- failed
+        cprint("${bright color.error}cross toolchain not found, please run:")
+        cprint("    - xmake config --sdk=xxx")
+        cprint("or  - xmake global --sdk=xxx")
+        raise()
+    end
+    return cross_toolchain
+end
diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua
new file mode 100644
index 000000000..78be10f98
--- /dev/null
+++ b/xmake/toolchains/cross/xmake.lua
@@ -0,0 +1,66 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        xmake.lua
+--
+
+-- define toolchain
+toolchain("cross")
+       
+    -- check toolchain
+    on_check("check")
+
+    -- on load
+    on_load(function (toolchain)
+
+        -- imports
+        import("core.project.config")
+
+        -- get cross prefix
+        local cross = config.get("cross") or ""
+
+        -- set toolsets
+        toolchain:set("toolsets", "cc", cross .. "gcc", cross .. "clang")
+        toolchain:set("toolsets", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++")
+        toolchain:set("toolsets", "cpp", cross .. "gcc -E", cross .. "clang -E")
+        toolchain:set("toolsets", "as", cross .. "gcc", cross .. "clang")
+        toolchain:set("toolsets", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolsets", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang")
+        toolchain:set("toolsets", "ar", cross .. "ar")
+        toolchain:set("toolsets", "ex", cross .. "ar")
+        toolchain:set("toolsets", "ranlib", cross .. "ranlib")
+        toolchain:set("toolsets", "strip", cross .. "strip")
+
+        -- init linkdirs and includedirs
+        local sdkdir = toolchain:sdkdir()
+        if sdkdir then
+            local includedir = path.join(sdkdir, "include")
+            if os.isdir(includedir) then
+                toolchain:add("includedirs", includedir)
+            end
+            local linkdir = path.join(sdkdir, "lib")
+            if os.isdir(linkdir) then
+                toolchain:add("linkdirs", linkdir)
+            end
+        end
+
+        -- add bin search library for loading some dependent .dll files windows 
+        local bindir = toolchain:bindir()
+        if bindir and is_host("windows") then
+            os.addenv("PATH", bindir)
+        end
+    end)
diff --git a/xmake/toolchains/envs/xmake.lua b/xmake/toolchains/envs/xmake.lua
index 899802b8e..f5dda488b 100644
--- a/xmake/toolchains/envs/xmake.lua
+++ b/xmake/toolchains/envs/xmake.lua
@@ -24,8 +24,8 @@ toolchain("envs")
     -- set toolsets
     set_toolsets("cc",    "$(env CC)")
     set_toolsets("cxx",   "$(env CXX)")
-    set_toolsets("ld",    "$(env LD)")
-    set_toolsets("sh",    "$(env SH)")
+    set_toolsets("ld",    "$(env LD)", "$(env CXX)")
+    set_toolsets("sh",    "$(env SH)", "$(env LD)", "$(env CXX)")
     set_toolsets("ar",    "$(env AR)")
     set_toolsets("ex",    "$(env EX)", "$(env AR)")
     set_toolsets("strip", "$(env STRIP)")
diff --git a/xmake/toolchains/llvm/check.lua b/xmake/toolchains/llvm/check.lua
new file mode 100644
index 000000000..6a5bd874d
--- /dev/null
+++ b/xmake/toolchains/llvm/check.lua
@@ -0,0 +1,41 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check.lua
+--
+
+-- imports
+import("core.project.config")
+import("detect.sdks.find_cross_toolchain")
+
+-- check the cross toolchain
+function main(toolchain)
+
+    -- find cross toolchain
+    local cross_toolchain = find_cross_toolchain(config.get("sdk") or config.get("bin"), {bindir = config.get("bin"), cross = config.get("cross")})
+    if cross_toolchain then
+        config.set("cross", cross_toolchain.cross, {readonly = true, force = true})
+        config.set("bin", cross_toolchain.bindir, {readonly = true, force = true})
+    else
+        -- failed
+        cprint("${bright color.error}cross toolchain not found, please run:")
+        cprint("    - xmake config --sdk=xxx")
+        cprint("or  - xmake global --sdk=xxx")
+        raise()
+    end
+    return cross_toolchain
+end
diff --git a/xmake/toolchains/llvm/xmake.lua b/xmake/toolchains/llvm/xmake.lua
new file mode 100644
index 000000000..d04234809
--- /dev/null
+++ b/xmake/toolchains/llvm/xmake.lua
@@ -0,0 +1,60 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        xmake.lua
+--
+
+-- define toolchain
+toolchain("llvm")
+       
+    -- check toolchain
+    on_check("check")
+
+    -- on load
+    on_load(function (toolchain)
+
+        -- set toolsets
+        toolchain:set("toolsets", "cc", "clang")
+        toolchain:set("toolsets", "cxx", "clang", "clang++")
+        toolchain:set("toolsets", "cpp", "clang -E")
+        toolchain:set("toolsets", "as", "clang")
+        toolchain:set("toolsets", "ld", "clang++", "clang")
+        toolchain:set("toolsets", "sh", "clang++", "clang")
+        toolchain:set("toolsets", "ar", "llvm-ar")
+        toolchain:set("toolsets", "ex", "llvm-ar")
+        toolchain:set("toolsets", "ranlib", "llvm-ranlib")
+        toolchain:set("toolsets", "strip", "llvm-strip")
+
+        -- init linkdirs and includedirs
+        local sdkdir = toolchain:sdkdir()
+        if sdkdir then
+            local includedir = path.join(sdkdir, "include")
+            if os.isdir(includedir) then
+                toolchain:add("includedirs", includedir)
+            end
+            local linkdir = path.join(sdkdir, "lib")
+            if os.isdir(linkdir) then
+                toolchain:add("linkdirs", linkdir)
+            end
+        end
+
+        -- add bin search library for loading some dependent .dll files windows 
+        local bindir = toolchain:bindir()
+        if bindir and is_host("windows") then
+            os.addenv("PATH", bindir)
+        end
+    end)