check golang tools for mingw and windows

4 files changed, 27 insertions, 6 deletions

diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua
index 12c42e459..6c92ec684 100644
--- a/xmake/platforms/linux/check.lua
+++ b/xmake/platforms/linux/check.lua
@@ -114,7 +114,7 @@ function _check_toolchains(config)
     checker.check_toolchain(config, "sc",   cross,  "swiftc",    "the swift compiler") 
     checker.check_toolchain(config, "dd",   cross,  "lldb",      "the debugger") 
 
-    -- check for go tools
+    -- check for golang tools
     checker.check_toolchain(config, "go",   "",     "go",       "the golang compiler") 
     checker.check_toolchain(config, "go",   "",     "gccgo",    "the golang compiler") 
     checker.check_toolchain(config, "go-ar","",     "go",       "the golang archiver") 
diff --git a/xmake/platforms/macosx/check.lua b/xmake/platforms/macosx/check.lua
index 43c17f7b3..fd11d6fb2 100644
--- a/xmake/platforms/macosx/check.lua
+++ b/xmake/platforms/macosx/check.lua
@@ -66,9 +66,6 @@ function _check_toolchains(config)
     checker.check_toolchain(config, "mm",   "",  "clang",           "the objc compiler") 
     checker.check_toolchain(config, "mxx",  "",  "clang++",         "the objc++ compiler") 
     checker.check_toolchain(config, "mxx",  "",  "clang",           "the objc++ compiler") 
-    checker.check_toolchain(config, "go",   "",  "go",              "the golang compiler") 
-    checker.check_toolchain(config, "go-ar","",  "go",              "the golang archiver") 
-    checker.check_toolchain(config, "go-ld","",  "go",              "the golang linker") 
     checker.check_toolchain(config, "sc",   "",  "swiftc",          "the swift compiler") 
     checker.check_toolchain(config, "as",   "",  "clang",           "the assember") 
     checker.check_toolchain(config, "ld",   "",  "clang++",         "the linker") 
@@ -78,6 +75,14 @@ function _check_toolchains(config)
     checker.check_toolchain(config, "sh",   "",  "clang++",         "the shared library linker") 
     checker.check_toolchain(config, "sh",   "",  "clang",           "the shared library linker") 
     checker.check_toolchain(config, "dd",   "",  "lldb",            "the debugger") 
+
+    -- check for golang tools
+    checker.check_toolchain(config, "go",   "",  "go",              "the golang compiler") 
+    checker.check_toolchain(config, "go",   "",  "gccgo",           "the golang compiler") 
+    checker.check_toolchain(config, "go-ar","",  "go",              "the golang archiver") 
+    checker.check_toolchain(config, "go-ar","",  "gccgo",           "the golang archiver") 
+    checker.check_toolchain(config, "go-ld","",  "go",              "the golang linker") 
+    checker.check_toolchain(config, "go-ld","",  "gccgo",           "the golang linker") 
 end
 
 -- check it
diff --git a/xmake/platforms/mingw/check.lua b/xmake/platforms/mingw/check.lua
index b70b60076..9823d9630 100644
--- a/xmake/platforms/mingw/check.lua
+++ b/xmake/platforms/mingw/check.lua
@@ -50,7 +50,7 @@ function _check_toolchains(config)
         end
     end
 
-    -- done
+    -- check
     checker.check_toolchain(config, "cc",   cross, "gcc",       "the c compiler") 
     checker.check_toolchain(config, "cxx",  cross, "g++",       "the c++ compiler") 
     checker.check_toolchain(config, "cxx",  cross, "gcc",       "the c++ compiler") 
@@ -62,6 +62,14 @@ function _check_toolchains(config)
     checker.check_toolchain(config, "sh",   cross, "g++",       "the shared library linker") 
     checker.check_toolchain(config, "sh",   cross, "gcc",       "the shared library linker") 
     checker.check_toolchain(config, "sc",   cross, "swiftc",    "the swift compiler") 
+
+    -- check for golang tools
+    checker.check_toolchain(config, "go",   "",  "go",          "the golang compiler") 
+    checker.check_toolchain(config, "go",   "",  "gccgo",       "the golang compiler") 
+    checker.check_toolchain(config, "go-ar","",  "go",          "the golang archiver") 
+    checker.check_toolchain(config, "go-ar","",  "gccgo",       "the golang archiver") 
+    checker.check_toolchain(config, "go-ld","",  "go",          "the golang linker") 
+    checker.check_toolchain(config, "go-ld","",  "gccgo",       "the golang linker") 
 end
 
 -- check it
diff --git a/xmake/platforms/windows/check.lua b/xmake/platforms/windows/check.lua
index 630099952..6d8411e92 100644
--- a/xmake/platforms/windows/check.lua
+++ b/xmake/platforms/windows/check.lua
@@ -189,7 +189,7 @@ function _check_toolchains(config)
     -- enter environment
     environment.enter("toolchains")
 
-    -- done
+    -- check
     checker.check_toolchain(config, "cc",   "", "cl.exe",           "the c compiler") 
     checker.check_toolchain(config, "cxx",  "", "cl.exe",           "the c++ compiler") 
     checker.check_toolchain(config, "ld",   "", "link.exe",         "the linker") 
@@ -204,6 +204,14 @@ function _check_toolchains(config)
 
     -- leave environment
     environment.leave("toolchains")
+
+    -- check for golang tools
+    checker.check_toolchain(config, "go",   "",  "go",              "the golang compiler") 
+    checker.check_toolchain(config, "go",   "",  "gccgo",           "the golang compiler") 
+    checker.check_toolchain(config, "go-ar","",  "go",              "the golang archiver") 
+    checker.check_toolchain(config, "go-ar","",  "gccgo",           "the golang archiver") 
+    checker.check_toolchain(config, "go-ld","",  "go",              "the golang linker") 
+    checker.check_toolchain(config, "go-ld","",  "gccgo",           "the golang linker") 
 end
 
 -- check the debugger