fix swiftc and on_load environment

1 files changed, 10 insertions, 3 deletions

diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index f16d61c5d..5195df00b 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -41,6 +41,7 @@ local option                = require("project/option")
 local package               = require("project/package")
 local deprecated_project    = require("project/deprecated/project")
 local platform              = require("platform/platform")
+local environment           = require("platform/environment")
 local language              = require("language/language")
 local sandbox_os            = require("sandbox/modules/os")
 
@@ -434,19 +435,25 @@ function project.load()
     -- save targets
     project._TARGETS = targets
 
+    -- enter toolchains environment
+    environment.enter("toolchains")
+
     -- on load for each target
     for _, target in pairs(targets) do
         local on_load = target:script("load")
         if on_load then
             ok, errors = sandbox.load(on_load, target)
             if not ok then
-                return false, errors
+                break
             end
         end
     end
 
-    -- ok
-    return true
+    -- leave toolchains environment
+    environment.leave("toolchains")
+
+    -- ok?
+    return ok, errors
 end
 
 -- get the given target