From 51c400a113bd4315a96ad36b7548fd6817cf52b5 Mon Sep 17 00:00:00 2001 From: ruki Date: Sun, 1 Nov 2020 10:38:55 +0800 Subject: improve musl/gnu-rm toolchain --- .../private/detect/find_cross_toolchain.lua | 47 ---------------- xmake/toolchains/cross/check.lua | 47 ++++++++++++++++ xmake/toolchains/cross/load.lua | 64 ++++++++++++++++++++++ xmake/toolchains/cross/xmake.lua | 44 +-------------- xmake/toolchains/gnu-rm/xmake.lua | 40 ++------------ xmake/toolchains/musl/xmake.lua | 40 ++------------ 6 files changed, 126 insertions(+), 156 deletions(-) delete mode 100644 xmake/modules/private/detect/find_cross_toolchain.lua create mode 100644 xmake/toolchains/cross/check.lua create mode 100644 xmake/toolchains/cross/load.lua diff --git a/xmake/modules/private/detect/find_cross_toolchain.lua b/xmake/modules/private/detect/find_cross_toolchain.lua deleted file mode 100644 index 0f18eede7..000000000 --- a/xmake/modules/private/detect/find_cross_toolchain.lua +++ /dev/null @@ -1,47 +0,0 @@ ---!A cross-toolchain 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-2020, TBOOX Open Source Group. --- --- @author ruki --- @file find_cross_toolchain.lua --- - --- imports -import("core.project.config") -import("detect.sdks.find_cross_toolchain") - --- check the cross toolchain -function main(toolchain) - - -- is cross? - local sdkdir = config.get("sdk") - local bindir = config.get("bin") - local cross = config.get("cross") - if not sdkdir and not bindir and not cross then - return - end - - -- find cross toolchain - local cross_toolchain = find_cross_toolchain(sdkdir, {bindir = bindir, cross = cross}) - if cross_toolchain then - config.set("cross", cross_toolchain.cross, {readonly = true, force = true}) - config.set("bin", cross_toolchain.bindir, {readonly = true, force = true}) - config.set("sdkdir", cross_toolchain.sdkdir, {readonly = true, force = true}) -- only for toolchain - else - raise("cross toolchain not found!") - end - return cross_toolchain -end - diff --git a/xmake/toolchains/cross/check.lua b/xmake/toolchains/cross/check.lua new file mode 100644 index 000000000..465457c22 --- /dev/null +++ b/xmake/toolchains/cross/check.lua @@ -0,0 +1,47 @@ +--!A cross-toolchain 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-2020, TBOOX Open Source Group. +-- +-- @author ruki +-- @file check.lua +-- + +-- imports +import("core.project.config") +import("detect.sdks.find_cross_toolchain") + +-- check the cross toolchain +function main(toolchain) + + -- is cross? + local sdkdir = config.get("sdk") + local bindir = config.get("bin") + local cross = config.get("cross") + if not sdkdir and not bindir and not cross then + return + end + + -- find cross toolchain + local cross_toolchain = find_cross_toolchain(sdkdir, {bindir = bindir, cross = cross}) + if cross_toolchain then + config.set("cross", cross_toolchain.cross, {readonly = true, force = true}) + config.set("bin", cross_toolchain.bindir, {readonly = true, force = true}) + config.set("sdkdir", cross_toolchain.sdkdir, {readonly = true, force = true}) -- only for toolchain + else + raise("cross toolchain not found!") + end + return cross_toolchain +end + diff --git a/xmake/toolchains/cross/load.lua b/xmake/toolchains/cross/load.lua new file mode 100644 index 000000000..26fea7d5e --- /dev/null +++ b/xmake/toolchains/cross/load.lua @@ -0,0 +1,64 @@ +--!A cross-toolchain 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-2020, TBOOX Open Source Group. +-- +-- @author ruki +-- @file load.lua +-- + +-- imports +import("core.project.config") + +-- load the cross toolchain +function main(toolchain) + + -- imports + import("core.project.config") + + -- get cross prefix + local cross = config.get("cross") or "" + + -- set toolset + toolchain:set("toolset", "cc", cross .. "gcc", cross .. "clang") + toolchain:set("toolset", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++") + toolchain:set("toolset", "cpp", cross .. "gcc -E", cross .. "clang -E") + toolchain:set("toolset", "as", cross .. "gcc", cross .. "clang") + toolchain:set("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") + toolchain:set("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") + toolchain:set("toolset", "ar", cross .. "ar") + toolchain:set("toolset", "ex", cross .. "ar") + toolchain:set("toolset", "ranlib", cross .. "ranlib") + toolchain:set("toolset", "strip", cross .. "strip") + + -- init linkdirs and includedirs + local sdkdir = toolchain:sdkdir() + if sdkdir then + local includedir = path.join(sdkdir, "include") + if os.isdir(includedir) then + toolchain:add("includedirs", includedir) + end + local linkdir = path.join(sdkdir, "lib") + if os.isdir(linkdir) then + toolchain:add("linkdirs", linkdir) + end + end + + -- add bin search library for loading some dependent .dll files windows + local bindir = toolchain:bindir() + if bindir and is_host("windows") then + toolchain:add("runenvs", "PATH", bindir) + end +end + diff --git a/xmake/toolchains/cross/xmake.lua b/xmake/toolchains/cross/xmake.lua index ea7bef5d5..70c04efba 100644 --- a/xmake/toolchains/cross/xmake.lua +++ b/xmake/toolchains/cross/xmake.lua @@ -28,45 +28,7 @@ toolchain("cross") set_kind("standalone") -- check toolchain - on_check("private.detect.find_cross_toolchain") + on_check("check") - -- on load - on_load(function (toolchain) - - -- imports - import("core.project.config") - - -- get cross prefix - local cross = config.get("cross") or "" - - -- set toolset - toolchain:set("toolset", "cc", cross .. "gcc", cross .. "clang") - toolchain:set("toolset", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++") - toolchain:set("toolset", "cpp", cross .. "gcc -E", cross .. "clang -E") - toolchain:set("toolset", "as", cross .. "gcc", cross .. "clang") - toolchain:set("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") - toolchain:set("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") - toolchain:set("toolset", "ar", cross .. "ar") - toolchain:set("toolset", "ex", cross .. "ar") - toolchain:set("toolset", "ranlib", cross .. "ranlib") - toolchain:set("toolset", "strip", cross .. "strip") - - -- init linkdirs and includedirs - local sdkdir = toolchain:sdkdir() - if sdkdir then - local includedir = path.join(sdkdir, "include") - if os.isdir(includedir) then - toolchain:add("includedirs", includedir) - end - local linkdir = path.join(sdkdir, "lib") - if os.isdir(linkdir) then - toolchain:add("linkdirs", linkdir) - end - end - - -- add bin search library for loading some dependent .dll files windows - local bindir = toolchain:bindir() - if bindir and is_host("windows") then - toolchain:add("runenvs", "PATH", bindir) - end - end) + -- load toolchain + on_load("load") diff --git a/xmake/toolchains/gnu-rm/xmake.lua b/xmake/toolchains/gnu-rm/xmake.lua index 8299aea64..1c6fb267c 100644 --- a/xmake/toolchains/gnu-rm/xmake.lua +++ b/xmake/toolchains/gnu-rm/xmake.lua @@ -29,47 +29,19 @@ toolchain("gnu-rm") set_kind("standalone") -- check toolchain - on_check("private.detect.find_cross_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()}) - -- get cross prefix - local cross = config.get("cross") or "" - - -- set toolset - toolchain:set("toolset", "cc", cross .. "gcc", cross .. "clang") - toolchain:set("toolset", "cxx", cross .. "gcc", cross .. "clang", cross .. "g++", cross .. "clang++") - toolchain:set("toolset", "cpp", cross .. "gcc -E", cross .. "clang -E") - toolchain:set("toolset", "as", cross .. "gcc", cross .. "clang") - toolchain:set("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") - toolchain:set("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") - toolchain:set("toolset", "ar", cross .. "ar") - toolchain:set("toolset", "ex", cross .. "ar") - toolchain:set("toolset", "ranlib", cross .. "ranlib") - toolchain:set("toolset", "strip", cross .. "strip") - - -- init linkdirs and includedirs - local sdkdir = toolchain:sdkdir() - if sdkdir then - local includedir = path.join(sdkdir, "include") - if os.isdir(includedir) then - toolchain:add("includedirs", includedir) - end - local linkdir = path.join(sdkdir, "lib") - if os.isdir(linkdir) then - toolchain:add("linkdirs", linkdir) - end - end - - -- add bin search library for loading some dependent .dll files windows - local bindir = toolchain:bindir() - if bindir and is_host("windows") then - toolchain:add("runenvs", "PATH", bindir) - end + -- load basic configuration of cross toolchain + load(toolchain) -- add basic flags toolchain:add("ldflags", "--specs=nosys.specs", "--specs=nano.specs", {force = true}) diff --git a/xmake/toolchains/musl/xmake.lua b/xmake/toolchains/musl/xmake.lua index 24309180d..f7da3f4c8 100644 --- a/xmake/toolchains/musl/xmake.lua +++ b/xmake/toolchains/musl/xmake.lua @@ -29,47 +29,19 @@ toolchain("musl") set_kind("standalone") -- check toolchain - on_check("private.detect.find_cross_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()}) - -- get cross prefix - local cross = config.get("cross") or "" - - -- set toolset - toolchain:set("toolset", "cc", cross .. "gcc") - toolchain:set("toolset", "cxx", cross .. "gcc") - toolchain:set("toolset", "cpp", cross .. "gcc -E") - toolchain:set("toolset", "as", cross .. "gcc") - toolchain:set("toolset", "ld", cross .. "g++", cross .. "gcc") - toolchain:set("toolset", "sh", cross .. "g++", cross .. "gcc") - toolchain:set("toolset", "ar", cross .. "ar") - toolchain:set("toolset", "ex", cross .. "ar") - toolchain:set("toolset", "ranlib", cross .. "ranlib") - toolchain:set("toolset", "strip", cross .. "strip") - - -- init linkdirs and includedirs - local sdkdir = toolchain:sdkdir() - if sdkdir then - local includedir = path.join(sdkdir, "include") - if os.isdir(includedir) then - toolchain:add("includedirs", includedir) - end - local linkdir = path.join(sdkdir, "lib") - if os.isdir(linkdir) then - toolchain:add("linkdirs", linkdir) - end - end - - -- add bin search library for loading some dependent .dll files windows - local bindir = toolchain:bindir() - if bindir and is_host("windows") then - toolchain:add("runenvs", "PATH", bindir) - end + -- load basic configuration of cross toolchain + load(toolchain) -- add flags for arch if toolchain:is_arch("arm") then -- cgit v1.3.1