diff options
| author | ruki <[email protected]> | 2024-06-24 23:08:52 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-06-24 23:08:52 +0800 |
| commit | de48240b9e2ef01b24425742e5b6a5ca20666384 (patch) | |
| tree | 740b0fb42091ec1f7ea75f1173555b8409539c3d /xmake/modules | |
| parent | 5a8ae5e11f5e1238ba6967d2c977707cd70579bf (diff) | |
| parent | cf98da127fec9dcf204b72ac38ebbb0bb6b29a30 (diff) | |
Merge pull request #5247 from CofeCofe/master
Add armclang version judgement and automatically select assembler based on the result
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/detect/tools/find_armclang.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmake/modules/detect/tools/find_armclang.lua b/xmake/modules/detect/tools/find_armclang.lua index ed6b0bbfe..0b33ac6fc 100644 --- a/xmake/modules/detect/tools/find_armclang.lua +++ b/xmake/modules/detect/tools/find_armclang.lua @@ -39,7 +39,8 @@ import("detect.sdks.find_mdk") function main(opt) -- init options - opt = opt or {} + opt = opt or {} + opt.parse = opt.parse or function (output) return output:match("Arm Compiler for Embedded (%d+%.?%d+%.?%d+)%s") end -- find program local program = find_program(opt.program or "armclang.exe", opt) |