add toolchain check

6 files changed, 167 insertions, 22 deletions

diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index 8a62afd8d..246d46a99 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -61,26 +61,6 @@ end
 
 -- get the toolchain configuration
 function _instance:get(name)
-
-    -- attempt to get the static configure value
-    local value = self._INFO:get(name)
-    if value ~= nil then
-        return value
-    end
-
-    -- lazy loading toolchain if get other configuration
-    if not self._LOADED and not self:_is_builtin_conf(name) then
-        local on_load = self._INFO:get("load")
-        if on_load then
-            local ok, errors = sandbox.load(on_load, self)
-            if not ok then
-                os.raise(errors)
-            end
-        end
-        self._LOADED = true
-    end
-
-    -- get other toolchain info
     return self._INFO:get(name)
 end
 
@@ -107,6 +87,34 @@ function _instance:bindir()
     return config.get("bin") or self:get("bindir")
 end
 
+-- do load 
+function _instance:_load()
+    if not self._LOADED then
+        local on_load = self._INFO:get("load")
+        if on_load then
+            local ok, errors = sandbox.load(on_load, self)
+            if not ok then
+                os.raise(errors)
+            end
+        end
+        self._LOADED = true
+    end
+end
+
+-- do check 
+function _instance:_check()
+    if not self._CHECKED then
+        local on_check = self._INFO:get("check")
+        if on_check then
+            local ok, errors = sandbox.load(on_check, self)
+            if not ok then
+                os.raise(errors)
+            end
+        end
+        self._CHECKED = true
+    end
+end
+
 -- get the tool description from the tool kind
 function _instance:_description(toolkind)
     local descriptions = self._DESCRIPTIONS
@@ -150,6 +158,9 @@ end
 -- check the given tool path
 function _instance:_checktool(toolkind, toolpath)
 
+    -- ensure to check this toolchain first
+    self:_check()
+
     -- get find_tool
     local find_tool = self._find_tool
     if not find_tool then
@@ -176,6 +187,11 @@ function _instance:_checktool(toolkind, toolpath)
             utils.cprint("${dim}checking for %s (%s: ${bright}%s${clear}) ... ${color.nothing}${text.nothing}", description, toolkind, name)
         end
     end
+
+    -- we only load it when checking the given tool successfully
+    if program then
+        self:_load()
+    end
     return program, toolname
 end
 
@@ -238,6 +254,7 @@ function toolchain._apis()
         {
             -- toolchain.on_xxx
             "toolchain.on_load"
+        ,   "toolchain.on_check"
         }
     ,   dictionary =
         {
diff --git a/xmake/platforms/macosx/config.lua b/xmake/platforms/macosx/config.lua
index a5c0893fc..a1713a657 100644
--- a/xmake/platforms/macosx/config.lua
+++ b/xmake/platforms/macosx/config.lua
@@ -146,6 +146,7 @@ end
 -- check it
 function main(platform, name)
 
+    --[[
     -- only check the given config name?
     if name then
         local toolchain = singleton.get("macosx.toolchains." .. (config.get("arch") or os.arch()), _toolchains)[name]
@@ -159,6 +160,6 @@ function main(platform, name)
 
         -- check xcode 
         check_xcode(config, true)
-    end
+    end]]
 end
 
diff --git a/xmake/platforms/macosx/xmake.lua b/xmake/platforms/macosx/xmake.lua
index b7abea032..fc390d953 100644
--- a/xmake/platforms/macosx/xmake.lua
+++ b/xmake/platforms/macosx/xmake.lua
@@ -37,7 +37,7 @@ platform("macosx")
     set_installdir("/usr/local")
 
     -- on check project configuration
-    on_config_check("config")
+--    on_config_check("config")
 
     -- on check global configuration
     on_global_check("global")
diff --git a/xmake/toolchains/xcode/check.lua b/xmake/toolchains/xcode/check.lua
new file mode 100644
index 000000000..c10fe48d9
--- /dev/null
+++ b/xmake/toolchains/xcode/check.lua
@@ -0,0 +1,28 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed 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-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check.lua
+--
+
+-- imports
+import("core.project.config")
+import("private.platform.check_xcode")
+
+-- main entry
+function main(toolchain)
+    check_xcode(config, true)
+end
diff --git a/xmake/toolchains/xcode/load.lua b/xmake/toolchains/xcode/load.lua
new file mode 100644
index 000000000..96d459414
--- /dev/null
+++ b/xmake/toolchains/xcode/load.lua
@@ -0,0 +1,94 @@
+--!A cross-toolchain build utility based on Lua
+--
+-- Licensed 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-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        load.lua
+--
+
+-- imports
+import("core.project.config")
+
+-- main entry
+function main(toolchain)
+
+    -- init flags for architecture
+    local arch          = config.get("arch") or os.arch()
+    local target_minver = config.get("target_minver")
+
+    -- init flags for the xcode sdk directory
+    local xcode_dir     = config.get("xcode")
+    local xcode_sdkver  = config.get("xcode_sdkver")
+    local xcode_sdkdir  = nil
+    if xcode_dir and xcode_sdkver then
+        xcode_sdkdir = xcode_dir .. "/Contents/Developer/toolchains/MacOSX.toolchain/Developer/SDKs/MacOSX" .. xcode_sdkver .. ".sdk"
+    end
+
+    -- init flags for c/c++
+    toolchain:add("cxflags", "-arch " .. arch)
+    toolchain:add("ldflags", "-arch " .. arch)
+    if target_minver then
+        toolchain:add("cxflags", "-mmacosx-version-min=" .. target_minver)
+        toolchain:add("mxflags", "-mmacosx-version-min=" .. target_minver)
+        toolchain:add("ldflags", "-mmacosx-version-min=" .. target_minver)
+    end
+    if xcode_sdkdir then
+        toolchain:add("cxflags", "-isysroot " .. xcode_sdkdir)
+        toolchain:add("ldflags", "-isysroot " .. xcode_sdkdir)
+    else
+        toolchain:add("cxflags", "-I/usr/local/include")
+        toolchain:add("cxflags", "-I/usr/include")
+        toolchain:add("ldflags", "-L/usr/local/lib")
+        toolchain:add("ldflags", "-L/usr/lib")
+    end
+    toolchain:add("ldflags", "-stdlib=libc++")
+    toolchain:add("ldflags", "-lz")
+    toolchain:add("shflags", toolchain:get("ldflags"))
+
+    -- init flags for objc/c++ (with ldflags and shflags)
+    toolchain:add("mxflags", "-arch " .. arch)
+    if xcode_sdkdir then
+        toolchain:add("mxflags", "-isysroot " .. xcode_sdkdir)
+    end
+
+    -- init flags for asm 
+--    toolchain:add("yasm.asflags", arch == "x86_64" and "macho64" or "macho32")
+--    toolchain:set("fasm.asflags", "")
+    toolchain:add("asflags", "-arch " .. arch)
+    if xcode_sdkdir then
+        toolchain:add("asflags", "-isysroot " .. xcode_sdkdir)
+    end
+
+    -- init flags for swift
+    if target_minver and xcode_sdkdir then
+        toolchain:add("scflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+        toolchain:add("scshflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+        toolchain:add("scldflags", format("-target %s-apple-macosx%s", arch, target_minver) , "-sdk " .. xcode_sdkdir)
+    end
+
+    --[[
+    -- init flags for golang
+    toolchain:set("gcldflags", "")
+
+    -- init flags for dlang
+    local dc_archs = { i386 = "-m32", x86_64 = "-m64" }
+    toolchain:add("dcflags", dc_archs[arch] or "")
+    toolchain:add("dcshflags", dc_archs[arch] or "")
+    toolchain:add("dcldflags", dc_archs[arch] or "" )
+
+    -- init flags for rust
+    toolchain:set("rcshflags", "")
+    toolchain:set("rcldflags", "")]]
+end
diff --git a/xmake/toolchains/xcode/xmake.lua b/xmake/toolchains/xcode/xmake.lua
index 1c39a6453..d9b1d9944 100644
--- a/xmake/toolchains/xcode/xmake.lua
+++ b/xmake/toolchains/xcode/xmake.lua
@@ -37,3 +37,8 @@ toolchain("xcode")
     set_toolsets("scld", "xcrun -sdk macosx swiftc", "swiftc")
     set_toolsets("scsh", "xcrun -sdk macosx swiftc", "swiftc")
 
+    -- check toolchain
+    on_check("check")
+
+    -- load toolchain
+    on_load("load")