diff options
Diffstat (limited to 'xmake/platforms')
| -rw-r--r-- | xmake/platforms/linux/check.lua | 10 | ||||
| -rw-r--r-- | xmake/platforms/macosx/check.lua | 20 | ||||
| -rw-r--r-- | xmake/platforms/windows/check.lua | 8 |
3 files changed, 26 insertions, 12 deletions
diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua index 6c92ec684..8b0c38dc6 100644 --- a/xmake/platforms/linux/check.lua +++ b/xmake/platforms/linux/check.lua @@ -78,7 +78,7 @@ function _check_toolchains(config) checker.check_toolchain_from_env(config, "ex", "AR", "the static library extractor") checker.check_toolchain_from_env(config, "sh", "SH", "the shared library linker") checker.check_toolchain_from_env(config, "sc", "SC", "the swift compiler") - checker.check_toolchain_from_env(config, "dd", "DD", "the debugger") + checker.check_toolchain_from_env(config, "dg", "DD", "the debugger") end -- check for gcc @@ -95,7 +95,7 @@ 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, "dd", cross, "gdb", "the debugger") + checker.check_toolchain(config, "dg", cross, "gdb", "the debugger") -- check for clang checker.check_toolchain(config, "cc", cross, "clang", "the c compiler") @@ -112,13 +112,13 @@ function _check_toolchains(config) checker.check_toolchain(config, "sh", cross, "clang++", "the shared library linker") checker.check_toolchain(config, "sh", cross, "clang", "the shared library linker") checker.check_toolchain(config, "sc", cross, "swiftc", "the swift compiler") - checker.check_toolchain(config, "dd", cross, "lldb", "the debugger") + checker.check_toolchain(config, "dg", cross, "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-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") end diff --git a/xmake/platforms/macosx/check.lua b/xmake/platforms/macosx/check.lua index fd11d6fb2..6a670534b 100644 --- a/xmake/platforms/macosx/check.lua +++ b/xmake/platforms/macosx/check.lua @@ -74,15 +74,29 @@ function _check_toolchains(config) checker.check_toolchain(config, "ex", "", "ar", "the static library extractor") 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") + checker.check_toolchain(config, "dg", "", "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-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, "dd", "", "dmd", "the dlang compiler") + checker.check_toolchain(config, "dd", "", "ldc2", "the dlang compiler") + checker.check_toolchain(config, "dd", "", "gdc", "the dlang compiler") + checker.check_toolchain(config, "dd-ar","", "dmd", "the dlang static library archiver") + checker.check_toolchain(config, "dd-ar","", "ldc2", "the dlang static library archiver") + checker.check_toolchain(config, "dd-ar","", "gdc", "the dlang static library archiver") + checker.check_toolchain(config, "dd-sh","", "dmd", "the dlang shared library linker") + checker.check_toolchain(config, "dd-sh","", "ldc2", "the dlang shared library linker") + checker.check_toolchain(config, "dd-sh","", "gdc", "the dlang shared library linker") + checker.check_toolchain(config, "dd-ld","", "dmd", "the dlang linker") + checker.check_toolchain(config, "dd-ld","", "ldc2", "the dlang linker") + checker.check_toolchain(config, "dd-ld","", "gdc", "the dlang linker") end -- check it diff --git a/xmake/platforms/windows/check.lua b/xmake/platforms/windows/check.lua index 6d8411e92..d66f4308c 100644 --- a/xmake/platforms/windows/check.lua +++ b/xmake/platforms/windows/check.lua @@ -208,8 +208,8 @@ function _check_toolchains(config) -- 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-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") end @@ -218,7 +218,7 @@ end function _check_debugger(config) -- get debugger - local debugger = config.get("dd") + local debugger = config.get("dg") if debugger then return end @@ -262,7 +262,7 @@ function _check_debugger(config) if debugger then -- save it - config.set("dd", debugger) + config.set("dg", debugger) -- trace print("checking for the debugger ... %s", path.filename(debugger)) |