From c6d413d07d771ed199b1b4d747625a6a7059fdca Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 20 May 2020 23:49:37 +0800 Subject: fix load toolchain --- xmake/core/tool/toolchain.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua index 97fb512a1..368a25b20 100644 --- a/xmake/core/tool/toolchain.lua +++ b/xmake/core/tool/toolchain.lua @@ -115,10 +115,12 @@ end -- do load function _instance:_load() - if not self._LOADED then + if not self._LOADED and not self._LOADING then local on_load = self._INFO:get("load") if on_load then + self._LOADING = true local ok, errors = sandbox.load(on_load, self) + self._LOADING = false if not ok then os.raise(errors) end -- cgit v1.3.1