add find cross toolchains and improve checking for linux and mingw

5 files changed, 86 insertions, 40 deletions

diff --git a/xmake/modules/detect/sdk/find_cross_toolchains.lua b/xmake/modules/detect/sdk/find_cross_toolchains.lua
new file mode 100644
index 000000000..0e989d6e7
--- /dev/null
+++ b/xmake/modules/detect/sdk/find_cross_toolchains.lua
@@ -0,0 +1,62 @@
+--!The Make-like Build Utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015 - 2017, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_cross_toolchains.lua
+--
+
+-- imports
+import("core.project.config")
+
+-- find cross toolchains
+--
+-- @param rootdir   the root directory of cross toolchains 
+-- @param opt       the argument options 
+--                  .e.g {bin = .., cross = ..}
+--
+-- @return          the toolchains array. .e.g {{bin = .., cross = ..}, .. }
+--
+-- @code 
+--
+-- local cross_toolchains = find_cross_toolchains("/xxx/android-cross-r10e")
+-- local cross_toolchains = find_cross_toolchains("/xxx/android-cross-r10e", {cross = "arm-linux-androideabi-"})
+-- local cross_toolchains = find_cross_toolchains("/xxx/android-cross-r10e", {cross = "arm-linux-androideabi-", bin = ..})
+-- 
+-- @endcode
+--
+function main(rootdir, opt)
+
+    -- init arguments
+    opt = opt or {}
+
+    -- get root directory
+    if not rootdir or not os.isdir(rootdir) then
+        return {}
+    end
+
+    -- find bin directory and cross
+    local cross_toolchains = {}
+    for _, ldpath in ipairs(os.files(path.join(opt.bin or rootdir, "**" .. (opt.cross or '-') .. "ld"))) do
+        table.insert(cross_toolchains, {bin = path.directory(ldpath), cross = path.basename(ldpath):sub(1, -3)})
+    end
+
+    -- ok?    
+    return cross_toolchains
+end
diff --git a/xmake/platforms/iphoneos/check.lua b/xmake/platforms/iphoneos/check.lua
index f912fc2b9..b3fa9b728 100644
--- a/xmake/platforms/iphoneos/check.lua
+++ b/xmake/platforms/iphoneos/check.lua
@@ -23,8 +23,7 @@
 --
 
 -- imports
-import("core.tool.tool")
-import("platforms.checker", {rootdir = os.programdir()})
+import(".checker")
 
 -- check the as
 function _check_as(shellname)
diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua
index 29f3f7d99..82e7737cc 100644
--- a/xmake/platforms/linux/check.lua
+++ b/xmake/platforms/linux/check.lua
@@ -23,8 +23,8 @@
 --
 
 -- imports
-import("core.tool.tool")
-import("platforms.checker", {rootdir = os.programdir()})
+import("detect.sdk.find_cross_toolchains")
+import(".checker")
 
 -- check the architecture
 function __check_arch(config)
@@ -49,24 +49,14 @@ function _toolchains(config)
         return _g.TOOLCHAINS
     end
 
-    -- get toolchains directory
-    local toolchainsdir = config.get("toolchains")
-    if not toolchainsdir then
-        local sdkdir = config.get("sdk")
-        if sdkdir then
-            toolchainsdir = path.join(sdkdir, "bin")
-        end
-    end
-
-    -- get cross
+    -- find cross toolchains
     local cross = ""
-    if toolchainsdir then
-        local ldpathes = os.match(path.join(toolchainsdir, "*-ld"))
-        for _, ldpath in ipairs(ldpathes) do
-            local ldname = path.basename(ldpath)
-            if ldname then
-                cross = ldname:sub(1, -3)
-            end
+    for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do
+        if toolchain.bin and toolchain.cross then
+            config.set("cross", toolchain.cross)
+            config.set("toolchains", toolchain.bin)
+            cross = toolchain.cross
+            break
         end
     end
 
diff --git a/xmake/platforms/mingw/check.lua b/xmake/platforms/mingw/check.lua
index 82a192518..887aa43db 100644
--- a/xmake/platforms/mingw/check.lua
+++ b/xmake/platforms/mingw/check.lua
@@ -23,8 +23,8 @@
 --
 
 -- imports
-import("core.tool.tool")
-import("platforms.checker", {rootdir = os.programdir()})
+import("detect.sdk.find_cross_toolchains")
+import(".checker")
 
 -- get toolchains
 function _toolchains(config)
@@ -34,24 +34,20 @@ function _toolchains(config)
         return _g.TOOLCHAINS
     end
 
-    -- get toolchains
-    local toolchainsdir = config.get("toolchains")
-    if not toolchainsdir then
-        local sdkdir = config.get("sdk")
-        if sdkdir then
-            toolchainsdir = path.join(sdkdir, "bin")
-        end
+    -- init arch
+    local arch = config.get("arch")
+    if not arch or arch == "i386" then
+        arch = "i686"
     end
 
-    -- get cross
+    -- find cross toolchains
     local cross = ""
-    if toolchainsdir then
-        local ldpathes = os.match(path.join(toolchainsdir, "*-ld"))
-        for _, ldpath in ipairs(ldpathes) do
-            local ldname = path.basename(ldpath)
-            if ldname then
-                cross = ldname:sub(1, -3)
-            end
+    for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do
+        if toolchain.bin and toolchain.cross and toolchain.cross:find(arch) then
+            config.set("cross", toolchain.cross)
+            config.set("toolchains", toolchain.bin)
+            cross = toolchain.cross
+            break
         end
     end
 
diff --git a/xmake/platforms/watchos/check.lua b/xmake/platforms/watchos/check.lua
index d7cf07cae..c6ce73e21 100644
--- a/xmake/platforms/watchos/check.lua
+++ b/xmake/platforms/watchos/check.lua
@@ -23,8 +23,7 @@
 --
 
 -- imports
-import("core.tool.tool")
-import("platforms.checker", {rootdir = os.programdir()})
+import(".checker")
 
 -- check the as
 function _check_as(shellname)