Merge pull request #6114 from xmake-io/toolchain

Add custom unknown toolchain support

6 files changed, 18 insertions, 31 deletions

diff --git a/tests/apis/set_toolchains/src/foo.cpp b/tests/apis/set_toolchains/src/foo.cpp
new file mode 100644
index 000000000..1a1fb3425
--- /dev/null
+++ b/tests/apis/set_toolchains/src/foo.cpp
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/tests/apis/set_toolchains/src/foo.h b/tests/apis/set_toolchains/src/foo.h
new file mode 100644
index 000000000..d2506bca9
--- /dev/null
+++ b/tests/apis/set_toolchains/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/set_toolchains/src/interface.cpp b/tests/apis/set_toolchains/src/interface.cpp
deleted file mode 100644
index 598d07560..000000000
--- a/tests/apis/set_toolchains/src/interface.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "interface.h"
-
-int add(int a, int b)
-{
-    return a + b;
-}
diff --git a/tests/apis/set_toolchains/src/interface.h b/tests/apis/set_toolchains/src/interface.h
deleted file mode 100644
index 4a41e9597..000000000
--- a/tests/apis/set_toolchains/src/interface.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*! calculate add(a, b) 
- *
- * @param a     the first argument
- * @param b     the second argument
- *
- * @return      the result
- */
-int             add(int a, int b);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/tests/apis/set_toolchains/src/test.cpp b/tests/apis/set_toolchains/src/test.cpp
index 72e03272b..ed1924789 100644
--- a/tests/apis/set_toolchains/src/test.cpp
+++ b/tests/apis/set_toolchains/src/test.cpp
@@ -1,10 +1,9 @@
-#include "interface.h"
+#include "foo.h"
 #include <iostream>
 
 using namespace std;
 
-int main(int argc, char** argv)
-{
-    cout << "add(1, 2) = " << add(1, 2) << endl; 
+int main(int argc, char** argv) {
+    cout << "add(1, 2) = " << add(1, 2) << endl;
     return 0;
 }
diff --git a/tests/apis/set_toolchains/xmake.lua b/tests/apis/set_toolchains/xmake.lua
index 9db80f107..75f866fbd 100644
--- a/tests/apis/set_toolchains/xmake.lua
+++ b/tests/apis/set_toolchains/xmake.lua
@@ -1,10 +1,6 @@
--- define toolchain
 toolchain("myclang")
-
-    -- mark as standalone toolchain
     set_kind("standalone")
 
-    -- set toolset
     set_toolset("cc", "clang")
     set_toolset("cxx", "clang", "clang++")
     set_toolset("ld", "clang++", "clang")
@@ -23,7 +19,7 @@ add_rules("mode.debug", "mode.release")
 
 target("test")
     set_kind("static")
-    add_files("src/interface.cpp")
+    add_files("src/foo.cpp")
     set_toolset("ar", "ar")
 
 target("demo")