Merge pull request #6416 from SirLynix/rust-targetriple

Make rustc target_triple public

Author: waruqi

xmake/modules/private/tools/rust/target_triple.lua renamed to xmake/modules/core/tools/rustc/target_triple.lua

@@ -45,9 +45,9 @@ end
 function _translate_plat(plat, arch, opt)
     if plat == "windows" then
         return "-pc-windows-msvc"
-    elseif plat == "mingw" then
+    elseif plat == "mingw" or plat == "msys" then
         return "-pc-windows-gnu"
-    elseif plat == "linux" then
+    elseif plat == "linux" or plat == "cross" then
         return "-unknown-linux-gnu"
     elseif plat == "macosx" then
         return "-apple-darwin"

xmake/modules/package/manager/cargo/install_package.lua

@@ -21,9 +21,9 @@
 -- imports
 import("core.base.option")
 import("core.project.config")
+import("core.tools.rustc.target_triple")
 import("lib.detect.find_tool")
 import("private.tools.rust.check_target")
-import("private.tools.rust.target_triple")
 
 -- translate local path in dependencies
 -- @see https://github.com/xmake-io/xmake/issues/4222

xmake/toolchains/rust/xmake.lua

@@ -28,7 +28,7 @@ toolchain("rust")
     set_toolset("rcar", "$(env RC)", "rustc")
 
     on_load(function (toolchain)
-        import("private.tools.rust.target_triple")
+        import("core.tools.rustc.target_triple")
 
         local opt = {}
         if toolchain:config("appledev") == "simulator" then