diff options
| author | ruki <[email protected]> | 2022-01-09 21:39:22 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-09 21:39:22 +0800 |
| commit | 2cc2da4c49c4a6b6649a316b60865dab889e7f76 (patch) | |
| tree | 2687c3dbd268d88e349ff0fd363d45a4138ebae7 | |
| parent | c432697422a4177b755cf5c1396251ec0cd43d87 (diff) | |
Update xmake.lua
| -rw-r--r-- | xmake/toolchains/armclang/xmake.lua | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/xmake/toolchains/armclang/xmake.lua b/xmake/toolchains/armclang/xmake.lua index f35f9fbfb..dc8c1c696 100644 --- a/xmake/toolchains/armclang/xmake.lua +++ b/xmake/toolchains/armclang/xmake.lua @@ -43,26 +43,24 @@ toolchain("armclang") end) on_load(function (toolchain) - local arch = toolchain:arch() - local arch_lower = arch:lower() - local arch_replace = "" - local arch_target = "" - - -- convert for ldflag - if arch_lower:startswith("cortex-m") then - arch_replace = arch_lower:replace("cortex-m", "Cortex-M", {plain=true}) - arch_target = "arm-arm-none-eabi" - end - if arch_lower:startswith("cortex-a") then - arch_replace = arch_lower:replace("cortex-a", "Cortex-A", {plain=true}) - arch_target = "aarch64-arm-none-eabi" - end - - if arch_lower then + local arch = toolchain:arch() + if arch then + local arch_cpu = arch:lower() + local arch_cpu_ld = "" + local arch_target = "" + if arch_cpu:startswith("cortex-m") then + arch_cpu_ld = arch_cpu:replace("cortex-m", "Cortex-M", {plain = true}) + arch_target = "arm-arm-none-eabi" + end + if arch_cpu:startswith("cortex-a") then + arch_cpu_ld = arch_cpu:replace("cortex-a", "Cortex-A", {plain = true}) + arch_target = "aarch64-arm-none-eabi" + end toolchain:add("cxflags", "-target=" .. arch_target) - toolchain:add("cxflags", "-mcpu=" .. arch_lower) + toolchain:add("cxflags", "-mcpu=" .. arch_cpu) toolchain:add("asflags", "-target=" .. arch_target) - toolchain:add("asflags", "-mcpu=" .. arch_lower) - toolchain:add("ldflags", "--cpu " .. arch_replace) + toolchain:add("asflags", "-mcpu=" .. arch_cpu) + toolchain:add("ldflags", "--cpu " .. arch_cpu_ld) end end) + |