Merge pull request #509 from mikisama/master

change `armlinker` to `armlink`
project-generator · Oct 3, 2023 · d89bf55 · d89bf55
2 parents d692a46 + e778ad3
commit d89bf55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/project_generator/templates/cmakelist_armclang.tmpl b/project_generator/templates/cmakelist_armclang.tmpl
@@ -49,7 +49,7 @@ set(CMAKE_C_COMPILER armclang)
 set(CMAKE_CXX_COMPILER armclang)
 set(CMAKE_ASM_COMPILER armclang)
 set(CMAKE_AR armar)
-set(CMAKE_LINKER armlinker)
+set(CMAKE_LINKER armlink)
 set(CMAKE_OBJCOPY fromelf)
 set(CMAKE_EXECUTABLE_SUFFIX_C ".axf")
 {% endif %}

diff --git a/project_generator/templates/cmakelist_armclang_workspace.tmpl b/project_generator/templates/cmakelist_armclang_workspace.tmpl
@@ -48,7 +48,7 @@ set(CMAKE_C_COMPILER armclang)
 set(CMAKE_CXX_COMPILER armclang)
 set(CMAKE_ASM_COMPILER armclang)
 set(CMAKE_AR armar)
-set(CMAKE_LINKER armlinker)
+set(CMAKE_LINKER armlink)
 set(CMAKE_OBJCOPY fromelf)
 set(CMAKE_EXECUTABLE_SUFFIX_C ".axf")