summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-02-23 09:14:39 +0800
committerruki <[email protected]>2017-02-23 09:14:39 +0800
commit3ed1f42166dbe310aa245678adfc95a2de1f2f14 (patch)
treeac0c1440fd411548bd4b368704fbae2435ec5258
parentbfd35395066fbea02062309dfea660144d162c43 (diff)
add golang and dlang tools for windows
-rw-r--r--xmake/platforms/android/check.lua2
-rw-r--r--xmake/platforms/mingw/check.lua9
-rw-r--r--xmake/platforms/windows/check.lua26
3 files changed, 21 insertions, 16 deletions
diff --git a/xmake/platforms/android/check.lua b/xmake/platforms/android/check.lua
index 4aa5d8b51..7962d1740 100644
--- a/xmake/platforms/android/check.lua
+++ b/xmake/platforms/android/check.lua
@@ -126,7 +126,7 @@ function _check_toolchains(config)
cross = "aarch64-linux-android-"
end
- -- done
+ -- check it for c/c++
checker.check_toolchain(config, "cc", cross, "gcc", "the c compiler")
checker.check_toolchain(config, "cxx", cross, "g++", "the c++ compiler")
checker.check_toolchain(config, "as", cross, "gcc", "the assember")
diff --git a/xmake/platforms/mingw/check.lua b/xmake/platforms/mingw/check.lua
index 9823d9630..7a0908017 100644
--- a/xmake/platforms/mingw/check.lua
+++ b/xmake/platforms/mingw/check.lua
@@ -61,15 +61,6 @@ function _check_toolchains(config)
checker.check_toolchain(config, "ex", cross, "ar", "the static library extractor")
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 d66f4308c..ff93704f2 100644
--- a/xmake/platforms/windows/check.lua
+++ b/xmake/platforms/windows/check.lua
@@ -206,12 +206,26 @@ function _check_toolchains(config)
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 static library archiver")
- checker.check_toolchain(config, "go-ar","", "gccgo", "the golang static library archiver")
- checker.check_toolchain(config, "go-ld","", "go", "the golang linker")
- checker.check_toolchain(config, "go-ld","", "gccgo", "the golang linker")
+ 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 static library archiver")
+ checker.check_toolchain(config, "go-ar", "", "gccgo", "the golang static library archiver")
+ checker.check_toolchain(config, "go-ld", "", "go", "the golang linker")
+ checker.check_toolchain(config, "go-ld", "", "gccgo", "the golang linker")
+
+ -- check for dlang tools
+ checker.check_toolchain(config, "dc", "", "dmd", "the dlang compiler")
+ checker.check_toolchain(config, "dc", "", "ldc2", "the dlang compiler")
+ checker.check_toolchain(config, "dc", "", "gdc", "the dlang compiler")
+ checker.check_toolchain(config, "dc-ar", "", "dmd", "the dlang static library archiver")
+ checker.check_toolchain(config, "dc-ar", "", "ldc2", "the dlang static library archiver")
+ checker.check_toolchain(config, "dc-ar", "", "gdc", "the dlang static library archiver")
+ checker.check_toolchain(config, "dc-sh", "", "dmd", "the dlang shared library linker")
+ checker.check_toolchain(config, "dc-sh", "", "ldc2", "the dlang shared library linker")
+ checker.check_toolchain(config, "dc-sh", "", "gdc", "the dlang shared library linker")
+ checker.check_toolchain(config, "dc-ld", "", "dmd", "the dlang linker")
+ checker.check_toolchain(config, "dc-ld", "", "ldc2", "the dlang linker")
+ checker.check_toolchain(config, "dc-ld", "", "gdc", "the dlang linker")
end
-- check the debugger