add go and rust toolchains

4 files changed, 63 insertions, 2 deletions

diff --git a/xmake/platforms/macosx/xmake.lua b/xmake/platforms/macosx/xmake.lua
index aef9fb37e..887577575 100644
--- a/xmake/platforms/macosx/xmake.lua
+++ b/xmake/platforms/macosx/xmake.lua
@@ -41,7 +41,7 @@ platform("macosx")
 
     -- set toolchains
 --    set_toolchains("custom", "xcode", "clang", "gcc", "dlang", "rust", "go", "cuda")
-    set_toolchains("envs", "xcode", "clang", "gcc", "dlang")
+    set_toolchains("envs", "xcode", "clang", "gcc", "dlang", "rust", "go")
 
     -- set menu
     set_menu {
diff --git a/xmake/toolchains/dlang/xmake.lua b/xmake/toolchains/dlang/xmake.lua
index 1ce144f8e..984dae6df 100644
--- a/xmake/toolchains/dlang/xmake.lua
+++ b/xmake/toolchains/dlang/xmake.lua
@@ -22,7 +22,7 @@
 toolchain("dlang")
         
     -- set toolsets
-    set_toolsets("dc", "dmd", "ldc2", "gdc")
+    set_toolsets("dc",   "dmd", "ldc2", "gdc")
     set_toolsets("dcld", "dmd", "ldc2", "gdc")
     set_toolsets("dcsh", "dmd", "ldc2", "gdc")
     set_toolsets("dcar", "dmd", "ldc2", "gdc")
diff --git a/xmake/toolchains/go/xmake.lua b/xmake/toolchains/go/xmake.lua
new file mode 100644
index 000000000..f7451a781
--- /dev/null
+++ b/xmake/toolchains/go/xmake.lua
@@ -0,0 +1,28 @@
+--!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("go")
+        
+    -- set toolsets
+    set_toolsets("gc",   "go", "gccgo")
+    set_toolsets("gcld", "go", "gccgo")
+    set_toolsets("gcar", "go", "gccgo")
+
diff --git a/xmake/toolchains/rust/xmake.lua b/xmake/toolchains/rust/xmake.lua
new file mode 100644
index 000000000..dca2325bb
--- /dev/null
+++ b/xmake/toolchains/rust/xmake.lua
@@ -0,0 +1,33 @@
+--!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("rust")
+        
+    -- set toolsets
+    set_toolsets("rc",   "rustc")
+    set_toolsets("rcld", "rustc")
+    set_toolsets("rcsh", "rustc")
+    set_toolsets("rcar", "rustc")
+
+    -- on load
+    on_load(function (toolchain)
+        -- TODO for android ndk
+    end)