diff options
| author | ruki <[email protected]> | 2017-06-16 15:45:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-06-16 15:45:31 +0800 |
| commit | b3cc1e1c42d8b367f2d0b1a93c236abe1cc94b34 (patch) | |
| tree | 206f6249f3f61d856ecbfb731661a2514923a91f /xmake/core/base | |
| parent | 4ce04f4a25ac9fa21e19ae4c568d7a253959680a (diff) | |
replace old find compiler scripts and fix string.endswith
Diffstat (limited to 'xmake/core/base')
| -rw-r--r-- | xmake/core/base/interpreter.lua | 2 | ||||
| -rw-r--r-- | xmake/core/base/string.lua | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua index 5c51b35e4..c23fa8457 100644 --- a/xmake/core/base/interpreter.lua +++ b/xmake/core/base/interpreter.lua @@ -700,7 +700,7 @@ function interpreter.new() instance:api_register(nil, "set_xmakever", interpreter.api_builtin_set_xmakever) -- load builtin module files - local builtin_module_files = os.match(path.join(xmake._CORE_DIR, "sandbox/modules/interpreter/*.lua")) + local builtin_module_files = os.match(path.join(os.programdir(), "core/sandbox/modules/interpreter/*.lua")) if builtin_module_files then for _, builtin_module_file in ipairs(builtin_module_files) do diff --git a/xmake/core/base/string.lua b/xmake/core/base/string.lua index f54f7b1a3..97945851e 100644 --- a/xmake/core/base/string.lua +++ b/xmake/core/base/string.lua @@ -131,13 +131,6 @@ function string.join(items, sep) return str end --- less than -function string:less(other) - - -- < ? - return string.strcmp(self, other) < 0 -end - -- try to format function string.tryformat(format, ...) |