File tree Expand file tree Collapse file tree 1 file changed +1
-15
lines changed Expand file tree Collapse file tree 1 file changed +1
-15
lines changed Original file line number Diff line number Diff line change @@ -118,26 +118,12 @@ add_subdirectory(features EXCLUDE_FROM_ALL)
118
118
add_subdirectory (cmsis/CMSIS_5/CMSIS/RTOS2 EXCLUDE_FROM_ALL )
119
119
add_subdirectory (cmsis/device/rtos EXCLUDE_FROM_ALL )
120
120
121
- # This is a temporary workaround to prevent the build from failing for MBED_TARGETS that
122
- # haven't been converted to build system targets yet.
123
- # The refactored MBED_TARGETS set the linker script and forward it to the build system as a
124
- # usage requirement. The 'old' mechanism was to set the linker script on the top level mbed-core
125
- # target. This was needed because MBED_TARGETS were not registered as buildsystem targets,
126
- # preventing CMake from working its usage requirements magic and forcing us to set the linker
127
- # script globally.
128
- #
129
121
# Ensure the words that make up the Mbed target name are separated with a hyphen, lowercase, and with the `mbed-` prefix.
130
122
string (TOLOWER ${MBED_TARGET} MBED_TARGET_CONVERTED )
131
123
string (REPLACE "_" "-" MBED_TARGET_CONVERTED ${MBED_TARGET_CONVERTED} )
132
124
string (PREPEND MBED_TARGET_CONVERTED "mbed-" )
133
125
134
- # TODO: Remove when all MBED_TARGETS have been converted to build system targets.
135
- if (TARGET ${MBED_TARGET_CONVERTED} )
136
- target_link_libraries (mbed-core INTERFACE ${MBED_TARGET_CONVERTED} )
137
- else ()
138
- get_property (LINKER_SCRIPT GLOBAL PROPERTY MBED_TARGET_LINKER_FILE )
139
- mbed_set_linker_script (mbed-core ${LINKER_SCRIPT} )
140
- endif ()
126
+ target_link_libraries (mbed-core INTERFACE ${MBED_TARGET_CONVERTED} )
141
127
142
128
#
143
129
# Configures the application
You can’t perform that action at this time.
0 commit comments