support circle compiler

7 files changed, 165 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6a272961..35c5e38ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * [#1438](https://github.com/xmake-io/xmake/issues/1438): Support code amalgamation, `xmake l cli.amalgamate`
 * [#1765](https://github.com/xmake-io/xmake/issues/1756): Support nim language
 * [#1762](https://github.com/xmake-io/xmake/issues/1762): Manage and switch the given package envs for `xrepo env`
+* [#1767](https://github.com/xmake-io/xmake/issues/1767): Support Circle compiler
 
 ### Changes
 
@@ -1118,6 +1119,7 @@
 * [#1438](https://github.com/xmake-io/xmake/issues/1438): 增加 `xmake l cli.amalgamate` 命令支持代码合并
 * [#1765](https://github.com/xmake-io/xmake/issues/1756): 支持 nim 语言
 * [#1762](https://github.com/xmake-io/xmake/issues/1762): 为 `xrepo env` 管理和切换指定的环境配置
+* [#1767](https://github.com/xmake-io/xmake/issues/1767): 支持 Circle 编译器
 
 ### 改进
 
diff --git a/README.md b/README.md
index 741e90823..bd9fa28de 100644
--- a/README.md
+++ b/README.md
@@ -226,6 +226,7 @@ muslcc        The musl-based cross-compilation toolchain
 fpc           Free Pascal Programming Language Compiler
 wasi          WASI-enabled WebAssembly C/C++ toolchain
 nim           Nim Programming Language Compiler
+circle        A new C++20 compiler
 ```
 
 ## Supported Languages
diff --git a/README_zh.md b/README_zh.md
index 8b40da549..ac7941603 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -234,6 +234,7 @@ muslcc        The musl-based cross-compilation toolchain
 fpc           Free Pascal Programming Language Compiler
 wasi          WASI-enabled WebAssembly C/C++ toolchain
 nim           Nim Programming Language Compiler
+circle        A new C++20 compiler
 ```
 
 ## 支持语言
diff --git a/xmake/modules/core/tools/circle.lua b/xmake/modules/core/tools/circle.lua
new file mode 100644
index 000000000..fcf567549
--- /dev/null
+++ b/xmake/modules/core/tools/circle.lua
@@ -0,0 +1,34 @@
+--!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        circle.lua
+--
+
+inherit("gcc")
+
+function init(self)
+    _super.init(self)
+end
+
+function nf_strip(self, level)
+    local maps =
+    {
+        debug = "-Wl,-S"
+    ,   all   = "-Wl,-s"
+    }
+    return maps[level]
+end
diff --git a/xmake/modules/detect/tools/circle/has_flags.lua b/xmake/modules/detect/tools/circle/has_flags.lua
new file mode 100644
index 000000000..6464e10b6
--- /dev/null
+++ b/xmake/modules/detect/tools/circle/has_flags.lua
@@ -0,0 +1,23 @@
+--!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        has_flags.lua
+--
+
+-- imports
+inherit("detect.tools.gcc.has_flags")
+
diff --git a/xmake/modules/detect/tools/find_circle.lua b/xmake/modules/detect/tools/find_circle.lua
new file mode 100644
index 000000000..ba2f805c2
--- /dev/null
+++ b/xmake/modules/detect/tools/find_circle.lua
@@ -0,0 +1,52 @@
+--!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        find_circle.lua
+--
+
+-- imports
+import("lib.detect.find_program")
+import("lib.detect.find_programver")
+
+-- find circle
+--
+-- @param opt   the argument options, e.g. {version = true}
+--
+-- @return      program, version
+--
+-- @code
+--
+-- local circle = find_circle()
+-- local circle, version = find_circle({program = "circle", version = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- find program
+    local program = find_program(opt.program or "circle", opt)
+
+    -- find program version
+    local version = nil
+    if program and opt.version then
+        version = find_programver(program, opt)
+    end
+    return program, version
+end
diff --git a/xmake/toolchains/circle/xmake.lua b/xmake/toolchains/circle/xmake.lua
new file mode 100644
index 000000000..2e5d84757
--- /dev/null
+++ b/xmake/toolchains/circle/xmake.lua
@@ -0,0 +1,52 @@
+--!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        xmake.lua
+--
+
+toolchain("circle")
+
+    set_homepage("https://www.circle-lang.org/")
+    set_description("A new C++20 compiler. It's written from scratch and designed for easy extension.")
+
+    set_kind("standalone")
+
+    set_toolset("cc", "circle")
+    set_toolset("cxx", "circle")
+    set_toolset("ld", "circle")
+    set_toolset("sh", "circle")
+    set_toolset("ar", "ar")
+    set_toolset("ex", "ar")
+    set_toolset("strip", "strip")
+
+    on_check(function (toolchain)
+        return import("lib.detect.find_tool")("circle")
+    end)
+
+    on_load(function (toolchain)
+        local march
+        if toolchain:is_arch("x86_64", "x64") then
+            march = "-m64"
+        elseif toolchain:is_arch("i386", "x86") then
+            march = "-m32"
+        end
+        if march then
+            toolchain:add("cxflags", march)
+            toolchain:add("ldflags", march)
+            toolchain:add("shflags", march)
+        end
+    end)