fix bit for luajit

2 files changed, 46 insertions, 28 deletions

diff --git a/xmake/core/base/bit.lua b/xmake/core/base/bit.lua
index cd81da087..768722318 100644
--- a/xmake/core/base/bit.lua
+++ b/xmake/core/base/bit.lua
@@ -18,31 +18,4 @@
 -- @file        bit.lua
 --
 
--- define module: bit
-local bit = bit or (xmake._LUAJIT and require("bit") or {})
-if xmake._LUAJIT then
-    return bit
-end
-
--- bit/and operation
-function bit.band(a, b)
-    return a & b
-end
-
--- bit/or operation
-function bit.bor(a, b)
-    return a | b
-end
-
--- bit/xor operation
-function bit.bxor(a, b)
-    return a ~ b
-end
-
--- bit/not operation
-function bit.bnot(a)
-    return ~a
-end
-
--- return module: bit
-return bit
+return (xmake._LUAJIT and require("bit") or require("base/compat/bit"))
diff --git a/xmake/core/base/compat/bit.lua b/xmake/core/base/compat/bit.lua
new file mode 100644
index 000000000..78d5be389
--- /dev/null
+++ b/xmake/core/base/compat/bit.lua
@@ -0,0 +1,45 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        bit.lua
+--
+
+-- define module: bit
+local bit = bit or {}
+
+-- bit/and operation
+function bit.band(a, b)
+    return a & b
+end
+
+-- bit/or operation
+function bit.bor(a, b)
+    return a | b
+end
+
+-- bit/xor operation
+function bit.bxor(a, b)
+    return a ~ b
+end
+
+-- bit/not operation
+function bit.bnot(a)
+    return ~a
+end
+
+-- return module: bit
+return bit