add namespace for toolchain

11 files changed, 106 insertions, 1 deletions

diff --git a/tests/apis/namespace/toolchain/.gitignore b/tests/apis/namespace/toolchain/.gitignore
new file mode 100644
index 000000000..152105761
--- /dev/null
+++ b/tests/apis/namespace/toolchain/.gitignore
@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+
diff --git a/tests/apis/namespace/toolchain/src/bar.cpp b/tests/apis/namespace/toolchain/src/bar.cpp
new file mode 100644
index 000000000..2c00cc6b6
--- /dev/null
+++ b/tests/apis/namespace/toolchain/src/bar.cpp
@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}
diff --git a/tests/apis/namespace/toolchain/src/bar.h b/tests/apis/namespace/toolchain/src/bar.h
new file mode 100644
index 000000000..47d8a7251
--- /dev/null
+++ b/tests/apis/namespace/toolchain/src/bar.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/apis/namespace/toolchain/src/foo.cpp b/tests/apis/namespace/toolchain/src/foo.cpp
new file mode 100644
index 000000000..1a1fb3425
--- /dev/null
+++ b/tests/apis/namespace/toolchain/src/foo.cpp
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/tests/apis/namespace/toolchain/src/foo.h b/tests/apis/namespace/toolchain/src/foo.h
new file mode 100644
index 000000000..d2506bca9
--- /dev/null
+++ b/tests/apis/namespace/toolchain/src/foo.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/apis/namespace/toolchain/src/main.cpp b/tests/apis/namespace/toolchain/src/main.cpp
new file mode 100644
index 000000000..4cf7b5e62
--- /dev/null
+++ b/tests/apis/namespace/toolchain/src/main.cpp
@@ -0,0 +1,9 @@
+#include "foo.h"
+#include "bar.h"
+#include <iostream>
+
+int main(int argc, char** argv) {
+    std::cout << "add(1, 2) = " << add(1, 2) << std::endl;
+    std::cout << "sub(2, 1) = " << sub(2, 1) << std::endl;
+    return 0;
+}
diff --git a/tests/apis/namespace/toolchain/test.lua b/tests/apis/namespace/toolchain/test.lua
new file mode 100644
index 000000000..83c0a9546
--- /dev/null
+++ b/tests/apis/namespace/toolchain/test.lua
@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end
diff --git a/tests/apis/namespace/toolchain/xmake.lua b/tests/apis/namespace/toolchain/xmake.lua
new file mode 100644
index 000000000..588541296
--- /dev/null
+++ b/tests/apis/namespace/toolchain/xmake.lua
@@ -0,0 +1,36 @@
+
+toolchain("toolchain0")
+    on_load(function (toolchain)
+        toolchain:add("defines", "TOOLCHAIN0")
+    end)
+
+namespace("ns1", function ()
+    toolchain("toolchain1")
+        on_load(function (toolchain)
+            toolchain:add("defines", "NS1_TOOLCHAIN1")
+        end)
+
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+        set_toolchains("toolchain1")
+
+    namespace("ns2", function()
+        toolchain("toolchain2")
+            on_load(function (toolchain)
+                toolchain:add("defines", "NS2_TOOLCHAIN2")
+            end)
+
+        target("bar")
+            set_kind("static")
+            add_files("src/bar.cpp")
+            set_toolchains("toolchain2")
+    end)
+
+    target("test")
+        set_kind("binary")
+        add_deps("foo", "ns2::bar")
+        add_files("src/main.cpp")
+        set_toolchains("toolchain0", "toolchain1", "ns2::toolchain2")
+end)
+
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index 8afcee6b9..72bec34d5 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -1112,8 +1112,12 @@ end
 
 -- get the given toolchain
 function project.toolchain(name, opt)
+    opt = opt or {}
     local toolchain_name = toolchain.parsename(name) -- we need to ignore `@packagename`
     local info = project._toolchains()[toolchain_name]
+    if info == nil and opt.namespace then
+        info = project._toolchains()[opt.namespace .. "::" .. toolchain_name]
+    end
     if info then
         return toolchain.load_withinfo(name, info, opt)
     end
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 9d5a9c07a..3f1875854 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -2495,6 +2495,7 @@ function _instance:toolchains()
                 local toolchain_opt = table.copy(self:extraconf("toolchains", name))
                 toolchain_opt.arch = self:arch()
                 toolchain_opt.plat = self:plat()
+                toolchain_opt.namespace = self:namespace()
                 local toolchain_inst, errors = toolchain.load(name, toolchain_opt)
                 -- attempt to load toolchain from project
                 if not toolchain_inst and target._project() then
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index 29bd5a09f..a19413d34 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -42,7 +42,12 @@ local sandbox_module = require("sandbox/modules/import/core/sandbox/module")
 -- new an instance
 function _instance.new(name, info, cachekey, is_builtin, configs)
     local instance       = table.inherit(_instance)
-    instance._NAME       = name
+    local parts = name:split("::", {plain = true})
+    instance._NAME = parts[#parts]
+    table.remove(parts)
+    if #parts > 0 then
+        instance._NAMESPACE = table.concat(parts, "::")
+    end
     instance._INFO       = info
     instance._IS_BUILTIN = is_builtin
     instance._CACHE      = toolchain._localcache()
@@ -68,6 +73,17 @@ function _instance:name()
     return self._NAME
 end
 
+-- get the namespace
+function _instance:namespace()
+    return self._NAMESPACE
+end
+
+-- get the full name
+function _instance:fullname()
+    local namespace = self:namespace()
+    return namespace and namespace .. "::" .. self:name() or self:name()
+end
+
 -- get toolchain platform
 function _instance:plat()
     return self._PLAT or self:config("plat")