Merge pull request #792 from xmake-io/toolchain

Improve to detect cross-compilation toolchains

5 files changed, 15 insertions, 15 deletions

diff --git a/xmake/languages/cuda/xmake.lua b/xmake/languages/cuda/xmake.lua
index 60f36f098..535d652f2 100644
--- a/xmake/languages/cuda/xmake.lua
+++ b/xmake/languages/cuda/xmake.lua
@@ -28,7 +28,7 @@ language("cuda")
     set_sourceflags {cu = "cuflags"}
 
     -- set target kinds
-    set_targetkinds {gpucode = "cu-ld", binary = "ld", static = "ar", shared = "sh"}
+    set_targetkinds {gpucode = "culd", binary = "ld", static = "ar", shared = "sh"}
 
     -- set target flags
     set_targetflags {gpucode = "culdflags", binary = "ldflags", static = "arflags", shared = "shflags"}
@@ -140,7 +140,7 @@ language("cuda")
                     {category = "Cross Complation Configuration/Compiler Configuration"         }
                 ,   {nil, "cu",         "kv", nil,          "The Cuda Compiler"                 }
                 ,   {nil, "cu-ccbin",   "kv", nil,          "The Cuda Host C++ Compiler"        }
-                ,   {nil, "cu-ld",      "kv", nil,          "The Cuda Linker"                   }
+                ,   {nil, "culd",      "kv", nil,          "The Cuda Linker"                   }
 
                 ,   {category = "Cross Complation Configuration/Compiler Flags Configuration"   }
                 ,   {nil, "cuflags",    "kv", nil,          "The Cuda Compiler Flags"           }
diff --git a/xmake/languages/dlang/xmake.lua b/xmake/languages/dlang/xmake.lua
index 6481381f0..f30706797 100644
--- a/xmake/languages/dlang/xmake.lua
+++ b/xmake/languages/dlang/xmake.lua
@@ -28,7 +28,7 @@ language("dlang")
     set_sourceflags {dc = "dcflags"}
 
     -- set target kinds
-    set_targetkinds {binary = "dc-ld", static = "dc-ar", shared = "dc-sh"}
+    set_targetkinds {binary = "dcld", static = "dcar", shared = "dcsh"}
 
     -- set target flags
     set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"}
@@ -113,9 +113,9 @@ language("dlang")
                 ,   {nil, "dc",         "kv", nil,          "The Dlang Compiler"                }
 
                 ,   {category = "Cross Complation Configuration/Linker Configuration"           }
-                ,   {nil, "dc-ld",      "kv", nil,          "The Dlang Linker"                  }
-                ,   {nil, "dc-ar",      "kv", nil,          "The Dlang Static Library Archiver" }
-                ,   {nil, "dc-sh",      "kv", nil,          "The Dlang Shared Library Linker"   }
+                ,   {nil, "dcld",      "kv", nil,          "The Dlang Linker"                  }
+                ,   {nil, "dcar",      "kv", nil,          "The Dlang Static Library Archiver" }
+                ,   {nil, "dcsh",      "kv", nil,          "The Dlang Shared Library Linker"   }
 
                 ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"    }
                 ,   {nil, "links",      "kv", nil,          "The Link Libraries"                }
diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua
index 385e43c8b..d78d64e1d 100644
--- a/xmake/languages/golang/xmake.lua
+++ b/xmake/languages/golang/xmake.lua
@@ -28,7 +28,7 @@ language("golang")
     set_sourceflags {gc = "gcflags"}
 
     -- set target kinds
-    set_targetkinds {binary = "gc-ld", static = "gc-ar"}
+    set_targetkinds {binary = "gcld", static = "gcar"}
 
     -- set target flags
     set_targetflags {binary = "ldflags", static = "arflags"}
@@ -109,7 +109,7 @@ language("golang")
                 ,   {nil, "go",         "kv", nil,          "The Golang Compiler"              }
 
                 ,   {category = "Cross Complation Configuration/Linker Configuration"          }
-                ,   {nil, "gc-ld",      "kv", nil,          "The Golang Linker"                }
+                ,   {nil, "gcld",      "kv", nil,          "The Golang Linker"                }
                 ,   {nil, "go-ar",      "kv", nil,          "The Golang Static Library Linker" }
 
                 ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"   }
diff --git a/xmake/languages/rust/xmake.lua b/xmake/languages/rust/xmake.lua
index 8afd1ea7a..044ed0111 100644
--- a/xmake/languages/rust/xmake.lua
+++ b/xmake/languages/rust/xmake.lua
@@ -28,7 +28,7 @@ language("rust")
     set_sourceflags {rc = "rcflags"}
 
     -- set target kinds
-    set_targetkinds {binary = "rc-ld", static = "rc-ar", shared = "rc-sh"}
+    set_targetkinds {binary = "rcld", static = "rcar", shared = "rcsh"}
 
     -- set target flags
     set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"}
@@ -94,9 +94,9 @@ language("rust")
                 ,   {nil, "rc",         "kv", nil,          "The Rust Compiler"                }
 
                 ,   {category = "Cross Complation Configuration/Linker Configuration"          }
-                ,   {nil, "rc-ld",      "kv", nil,          "The Rust Linker"                  }
-                ,   {nil, "rc-ar",      "kv", nil,          "The Rust Static Library Archiver" }
-                ,   {nil, "rc-sh",      "kv", nil,          "The Rust Shared Library Linker"   }
+                ,   {nil, "rcld",      "kv", nil,          "The Rust Linker"                  }
+                ,   {nil, "rcar",      "kv", nil,          "The Rust Static Library Archiver" }
+                ,   {nil, "rcsh",      "kv", nil,          "The Rust Shared Library Linker"   }
 
                 ,   {category = "Cross Complation Configuration/Builtin Flags Configuration"   }
                 ,   {nil, "linkdirs",   "kv", nil,          "The Link Search Directories"      }
diff --git a/xmake/languages/swift/xmake.lua b/xmake/languages/swift/xmake.lua
index a3b121a13..3ac1f0b87 100644
--- a/xmake/languages/swift/xmake.lua
+++ b/xmake/languages/swift/xmake.lua
@@ -28,7 +28,7 @@ language("swift")
     set_sourceflags {sc = "scflags"}
 
     -- set target kinds
-    set_targetkinds {binary = "sc-ld", static = "ar", shared = "sc-sh"}
+    set_targetkinds {binary = "scld", static = "ar", shared = "scsh"}
 
     -- set target flags
     set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"}
@@ -153,8 +153,8 @@ language("swift")
                 ,   { nil, "sc",            "kv", nil,          "The Swift Compiler"                                 }
 
                 ,   {category = "Cross Complation Configuration/Linker Configuration"                                }
-                ,   { nil, "sc-ld",         "kv", nil,          "The Swift Linker"                                   }
-                ,   { nil, "sc-sh",         "kv", nil,          "The Swift Shared Library Linker"                    }
+                ,   { nil, "scld",         "kv", nil,          "The Swift Linker"                                   }
+                ,   { nil, "scsh",         "kv", nil,          "The Swift Shared Library Linker"                    }
 
                 ,   { category = "Cross Complation Configuration/Builtin Flags Configuration"                        }
                 ,   { nil, "links",         "kv", nil,          "The Link Libraries"                                 }