commit 9af4d7dc0e4642bf63ef3f2ce47d992055ac0088
author David Hu <david.hu@arm.com> Wed Nov 01 07:52:17 2023 +0800
committer David Hu <david.hu@arm.com> Wed Nov 01 04:20:45 2023 +0100
tree 3bd0fd09682cc4b63920774366c22fae83665083
parent 5fe0a07c5490d57532dea8d178747c515bd0f6e9

Build: Set object extension to .o in NS toolchain

Change-Id: Ia19b8272d6bab59f038f78ebe5d91f93e46af24b
Signed-off-by: David Hu <david.hu@arm.com>

cmake/install.cmake

diff --git a/cmake/install.cmake b/cmake/install.cmake
index cd3d808..a25a64d 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -159,7 +159,6 @@
             DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
-
 ##################### Export image signing information #########################
 
 if(BL2)
@@ -260,3 +259,7 @@
 
 configure_file(${CMAKE_SOURCE_DIR}/config/spe_config.cmake.in
                ${INSTALL_CMAKE_DIR}/spe_config.cmake @ONLY)
+
+# Toolchain utils
+install(FILES       cmake/set_extensions.cmake
+        DESTINATION ${INSTALL_CMAKE_DIR})

platform/ns/toolchain_ns_ARMCLANG.cmake

diff --git a/platform/ns/toolchain_ns_ARMCLANG.cmake b/platform/ns/toolchain_ns_ARMCLANG.cmake
index ea1c88a..66af662 100644
--- a/platform/ns/toolchain_ns_ARMCLANG.cmake
+++ b/platform/ns/toolchain_ns_ARMCLANG.cmake
@@ -23,7 +23,7 @@
 # at a particular step in the compiler initialisation. It is used here to
 # configure the extensions for object files. Despite the name, it also works
 # with the Ninja generator.
-#set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_LIST_DIR}/cmake/set_extensions.cmake)
+set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_LIST_DIR}/set_extensions.cmake)
 
 if(NOT DEFINED CMAKE_OBJCOPY)
     set(CMAKE_OBJCOPY ${CROSS_COMPILE}-objcopy CACHE FILEPATH "Path to objcopy")

platform/ns/toolchain_ns_GNUARM.cmake

diff --git a/platform/ns/toolchain_ns_GNUARM.cmake b/platform/ns/toolchain_ns_GNUARM.cmake
index fb2ace9..4f7d066 100644
--- a/platform/ns/toolchain_ns_GNUARM.cmake
+++ b/platform/ns/toolchain_ns_GNUARM.cmake
@@ -30,6 +30,12 @@
 # Set compiler ID explicitly as it's not detected at this moment
 set(CMAKE_C_COMPILER_ID GNU)
 
+# This variable name is a bit of a misnomer. The file it is set to is included
+# at a particular step in the compiler initialisation. It is used here to
+# configure the extensions for object files. Despite the name, it also works
+# with the Ninja generator.
+set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_CURRENT_LIST_DIR}/set_extensions.cmake)
+
 # CMAKE_C_COMPILER_VERSION is not guaranteed to be defined.
 EXECUTE_PROCESS( COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION )