Skip to content

Commit 78ffbbf

Browse files
committed
fixup! [ATFE] Ensure dependency on multilib-yaml as script expects the file.
The script that performs the common header generation assumes the multilib YAML file is already generated. This change adds an explicit dependency on the multilib-yaml target to ensure the file exists before the common header generate step is triggered.
1 parent c1509b4 commit 78ffbbf

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

arm-software/embedded/arm-multilib/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ foreach(lib_idx RANGE ${lib_count_dec})
362362

363363
endforeach()
364364

365-
366365
# Multilib file is generated in two parts.
367366
# 1. Template is filled with multilib flags from json
368367
configure_file(
@@ -407,11 +406,11 @@ if(ENABLE_MULTILIB_HEADER_OPTIMISATION)
407406
"${CMAKE_CURRENT_BINARY_DIR}/multilib"
408407
"${CMAKE_CURRENT_BINARY_DIR}/multilib-optimised"
409408
COMMENT "Generating common headers"
410-
DEPENDS ${all_runtime_targets}
409+
DEPENDS ${all_runtime_targets} multilib-yaml
411410
)
412411

413412
install(
414-
DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/multilib-optimised/"
415-
DESTINATION .
413+
DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/multilib-optimised/"
414+
DESTINATION .
416415
)
417416
endif()

arm-software/embedded/arm-multilib/common-headers-generate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def extract_common_headers_for_targets(args):
134134
if os.path.exists(src_yaml):
135135
shutil.copy2(src_yaml, dst_yaml)
136136
else:
137-
print(f"Warning: {src_yaml} does not exist.")
137+
raise FileNotFoundError(f"Source yaml '{src_yaml}' does not exist.")
138138

139139

140140
def main():

0 commit comments

Comments
 (0)