diff options
| author | ruki <[email protected]> | 2022-06-12 05:56:04 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-06-12 05:56:04 +0800 |
| commit | d28603924edbd09db8dbac82877a01c879b55105 (patch) | |
| tree | a278ee7bbed1496c31be70d86069b78ab9d589f1 | |
| parent | 5cd6e992b5364bc7581141f195f411c3964f6fe8 (diff) | |
| parent | 7442a0b925741ef1d3f86d083a4d90891343bf37 (diff) | |
Merge pull request #2451 from KnightJun/master
Using 'armasm' as an assembler for armclang
| -rw-r--r-- | xmake/toolchains/armclang/xmake.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/toolchains/armclang/xmake.lua b/xmake/toolchains/armclang/xmake.lua index dc8c1c696..ee63cc660 100644 --- a/xmake/toolchains/armclang/xmake.lua +++ b/xmake/toolchains/armclang/xmake.lua @@ -29,7 +29,7 @@ toolchain("armclang") set_toolset("cxx", "armclang") set_toolset("ld", "armlink") set_toolset("ar", "armar") - set_toolset("as", "armclang") + set_toolset("as", "armasm") on_check(function (toolchain) import("lib.detect.find_tool") @@ -59,7 +59,7 @@ toolchain("armclang") toolchain:add("cxflags", "-target=" .. arch_target) toolchain:add("cxflags", "-mcpu=" .. arch_cpu) toolchain:add("asflags", "-target=" .. arch_target) - toolchain:add("asflags", "-mcpu=" .. arch_cpu) + toolchain:add("asflags", "--cpu=" .. arch_cpu) toolchain:add("ldflags", "--cpu " .. arch_cpu_ld) end end) |