summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/toolchains/cross/xmake.lua5
-rw-r--r--xmake/toolchains/gnu-rm/xmake.lua11
2 files changed, 1 insertions, 15 deletions
diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua
index 70c04efba..90e6d6057 100644
--- a/xmake/toolchains/cross/xmake.lua
+++ b/xmake/toolchains/cross/xmake.lua
@@ -27,8 +27,3 @@ toolchain("cross")
-- mark as standalone toolchain
set_kind("standalone")
- -- check toolchain
- on_check("check")
-
- -- load toolchain
- on_load("load")
diff --git a/xmake/toolchains/gnu-rm/xmake.lua b/xmake/toolchains/gnu-rm/xmake.lua
index 1c6fb267c..2f3f9ed40 100644
--- a/xmake/toolchains/gnu-rm/xmake.lua
+++ b/xmake/toolchains/gnu-rm/xmake.lua
@@ -28,20 +28,11 @@ toolchain("gnu-rm")
-- mark as standalone toolchain
set_kind("standalone")
- -- check toolchain
- on_check(function (toolchain)
- return import("toolchains.cross.check", {rootdir = os.programdir()})(toolchain)
- end)
-
-- on load
on_load(function (toolchain)
- -- imports
- import("core.project.config")
- import("toolchains.cross.load", {rootdir = os.programdir()})
-
-- load basic configuration of cross toolchain
- load(toolchain)
+ toolchain:load_cross_toolchain()
-- add basic flags
toolchain:add("ldflags", "--specs=nosys.specs", "--specs=nano.specs", {force = true})