summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform/linux
diff options
context:
space:
mode:
Diffstat (limited to 'xmake/scripts/platform/linux')
-rw-r--r--xmake/scripts/platform/linux/linux.lua3
-rw-r--r--xmake/scripts/platform/linux/prober.lua6
2 files changed, 8 insertions, 1 deletions
diff --git a/xmake/scripts/platform/linux/linux.lua b/xmake/scripts/platform/linux/linux.lua
index 3e3c0b063..406dc5c58 100644
--- a/xmake/scripts/platform/linux/linux.lua
+++ b/xmake/scripts/platform/linux/linux.lua
@@ -58,6 +58,9 @@ function linux.make(configs)
configs.tools.ex = config.get("ar")
configs.tools.sc = config.get("sc")
+ -- cross toolchains?
+ if config.get("cross") then return end
+
-- init flags for architecture
local archflags = nil
local arch = config.get("arch")
diff --git a/xmake/scripts/platform/linux/prober.lua b/xmake/scripts/platform/linux/prober.lua
index bb20036d6..4e50b13cf 100644
--- a/xmake/scripts/platform/linux/prober.lua
+++ b/xmake/scripts/platform/linux/prober.lua
@@ -42,7 +42,11 @@ function prober._probe_arch(configs)
if arch then return true end
-- init the default architecture
- configs.set("arch", xmake._ARCH)
+ if configs.get("cross") then
+ configs.set("arch", "none")
+ else
+ configs.set("arch", xmake._ARCH)
+ end
-- trace
utils.printf("checking for the architecture ... %s", configs.get("arch"))