improve scheme:get

1 files changed, 3 insertions, 4 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 849ab4fdd..75571f695 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -2462,13 +2462,10 @@ function _instance:schemes()
     local schemes = self._SCHEMES
     if not schemes then
         schemes = {}
+        schemes["__default__"] = scheme.new("__default__", {package = self})
         for _, name in ipairs(table.wrap(self:get("schemes"))) do
             schemes[name] = scheme.new(name, {package = self})
         end
-        -- add default scheme if no schemes are defined
-        if table.empty(schemes) then
-            schemes["__default__"] = scheme.new("__default__", {package = self})
-        end
         self._SCHEMES = schemes
     end
     return schemes
@@ -2479,6 +2476,8 @@ function _instance:schemes_orderlist()
     local schemes_orderlist = self._SCHEMES_ORDERLIST
     if not schemes_orderlist then
         schemes_orderlist = {}
+        -- always add default scheme first
+        table.insert(schemes_orderlist, self:scheme("__default__"))
         for _, name in ipairs(table.wrap(self:get("schemes"))) do
             table.insert(schemes_orderlist, self:scheme(name))
         end