fix on_load for require

1 files changed, 12 insertions, 1 deletions

diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index b2e102833..241c6068f 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -524,7 +524,7 @@ function project._load_requires()
             alias = extrainfo.alias
         end
 
-        -- load it from cache first
+        -- load it from cache first (@note will discard scripts in extrainfo) 
         local instance = requireinfo.load(alias or packagename)
         if not instance then
 
@@ -536,6 +536,17 @@ function project._load_requires()
             instance._INFO = { __requirestr = requirestr, __extrainfo = extrainfo }
         end
 
+        -- move scripts of extrainfo  (e.g. on_load ..) 
+        if extrainfo then
+            for k, v in pairs(extrainfo) do
+                if type(v) == "function" then
+                    instance._SCRIPTS = instance._SCRIPTS or {}
+                    instance._SCRIPTS[k] = v
+                    extrainfo[k] = nil
+                end
+            end
+        end
+
         -- add require info
         requires[alias or packagename] = instance
     end