Skip to content

Commit 60388a1

Browse files
committed
Merge branch 'main' into develop
2 parents 45637cd + 3708111 commit 60388a1

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

RTEMSConfig.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ 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+
message(STATUS ${RTEMS_OBJCOPY})
66+
set(RTEMS_OBJCOPY ${RTEMS_OBJCOPY} PARENT_SCOPE)
6567

6668
# I don't know what this is used for yet, but it might become handy
6769
if(NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})

RTEMSGeneric.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ set(CMAKE_C_COMPILER ${RTEMS_GCC} PARENT_SCOPE)
219219
set(CMAKE_CXX_COMPILER ${RTEMS_GXX} PARENT_SCOPE)
220220
set(CMAKE_ASM_COMPILER ${RTEMS_ASM} PARENT_SCOPE)
221221
set(CMAKE_LINKER ${RTEMS_LINKER} PARENT_SCOPE)
222+
set(RTEMS_OBJCOPY ${RTEMS_GCC}-objcopy PARENT_SCOPE)
222223

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

0 commit comments

Comments
 (0)