diff options
| author | ruki <[email protected]> | 2017-09-09 00:36:21 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-09-08 21:38:11 +0800 |
| commit | 7755ecd8b9b751cfec483bb16d30a4764f1aad14 (patch) | |
| tree | 7eda71dec5ddd5beb285806e4dc05e04f0581f7f /xmake/core/base/interpreter.lua | |
| parent | efd2ebdcc6c0e278068a9090e7b62af9c2727284 (diff) | |
impl optional package
Diffstat (limited to 'xmake/core/base/interpreter.lua')
| -rw-r--r-- | xmake/core/base/interpreter.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua index d5b122e22..abd5a3945 100644 --- a/xmake/core/base/interpreter.lua +++ b/xmake/core/base/interpreter.lua @@ -92,7 +92,7 @@ function interpreter._merge_root_scope(root, root_prev, override) local scope_values = root_prev[scope_kind_and_name] or {} local scope_root = root[scope_kind_and_name] or {} for name, values in pairs(scope_root) do - if not name:startswith("__") then + if not name:startswith("__override_") then if scope_root["__override_" .. name] then if override or scope_values[name] == nil then scope_values[name] = values @@ -124,7 +124,7 @@ function interpreter._fetch_root_scope(root) local scope_values = root[scope_kind .. "." .. scope_name] or {} local scope_root = root[scope_kind] or {} for name, values in pairs(scope_root) do - if not name:startswith("__") then + if not name:startswith("__override_") then if scope_root["__override_" .. name] then if scope_values[name] == nil then scope_values[name] = values |