Skip to content

Commit 1158eac

Browse files
committed
rtems utilities now cached
1 parent 82fd1f4 commit 1158eac

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

RTEMSConfig.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ function(rtems_general_config TARGET_NAME RTEMS_PREFIX RTEMS_BSP_PAIR)
6262
set(CMAKE_CXX_COMPILER ${CMAKE_CXX_COMPILER} PARENT_SCOPE)
6363
set(CMAKE_ASM_COMPILER ${CMAKE_ASM_COMPILER} PARENT_SCOPE)
6464
set(CMAKE_LINKER ${CMAKE_LINKER} PARENT_SCOPE)
65-
set(RTEMS_OBJCOPY ${RTEMS_OBJCOPY} PARENT_SCOPE)
66-
65+
6766
# I don't know what this is used for yet, but it might become handy
6867
if(NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
6968
set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR} PARENT_SCOPE)

RTEMSGeneric.cmake

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,14 +186,22 @@ if(NOT EXISTS "${RTEMS_LINKER}")
186186
"${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-ld")
187187
endif()
188188

189-
message(STATUS "Checking for RTEMS objcopy..")
189+
message(STATUS "Checking for RTEMS objcopy utility..")
190190
set(RTEMS_OBJCOPY "${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-objcopy")
191191
if(NOT EXISTS "${RTEMS_OBJCOPY}")
192192
message(WARNING
193193
"RTEMS ld linker not found at "
194194
"${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-objcopy")
195195
endif()
196196

197+
message(STATUS "Checking for RTEMS size utility..")
198+
set(RTEMS_SIZE "${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-size")
199+
if(NOT EXISTS "${RTEMS_SIZE}")
200+
message(WARNING
201+
"RTEMS ld linker not found at "
202+
"${RTEMS_BIN_PATH}/${RTEMS_ARCH_VERSION_NAME}-size")
203+
endif()
204+
197205
message(STATUS "Checking done.")
198206

199207
############################################
@@ -215,6 +223,8 @@ message(STATUS "RTEMS g++ compiler: ${RTEMS_GXX}")
215223
message(STATUS "RTEMS assembler: ${RTEMS_ASM}")
216224
message(STATUS "RTEMS linker: ${RTEMS_LINKER}")
217225
message(STATUS "RTEMS objcopy: ${RTEMS_OBJCOPY}")
226+
message(STATUS "RTEMS objcopy: ${RTEMS_SIZE}")
227+
218228

219229
if(${RTEMS_ARCH_NAME} STREQUAL "arm")
220230
set(CMAKE_SYSTEM_PROCESSOR arm PARENT_SCOPE)
@@ -228,7 +238,8 @@ set(CMAKE_C_COMPILER ${RTEMS_GCC} PARENT_SCOPE)
228238
set(CMAKE_CXX_COMPILER ${RTEMS_GXX} PARENT_SCOPE)
229239
set(CMAKE_ASM_COMPILER ${RTEMS_ASM} PARENT_SCOPE)
230240
set(CMAKE_LINKER ${RTEMS_LINKER} PARENT_SCOPE)
231-
set(RTEMS_OBJCOPY ${RTEMS_OBJCOPY} PARENT_SCOPE)
241+
set(RTEMS_OBJCOPY ${RTEMS_OBJCOPY} CACHE FILEPATH "RTEMS objcopy utilits")
242+
set(RTEMS_SIZE ${RTEMS_SIZE} CACHE FILEPATH "RTEMS size utility")
232243

233244
# Variables set in the cache so they can be used everywhere.
234245
set(RTEMS_ARCH_NAME ${RTEMS_ARCH_NAME} CACHE FILEPATH "Architecture name")

0 commit comments

Comments
 (0)