Skip to content

Commit 6f03014

Browse files
committed
[ATFE] Prioritize multilib-specific headers over target-level headers. (#451)
Adjust the header search order so that variant-specific directories (e.g armv6m_soft_nofp_size/include/) are searched before the common target-level directories (e.g include/) in the -internal-isystem list. This ensures that headers tailored for a specific multilib variant take precedence over the generic headers, allowing correct header resolution in the presence of overrides. Previously, the common target-level directory could shadow multilib-specific headers if the same file existed in both paths.
1 parent 82f2a81 commit 6f03014

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ foreach(lib_idx RANGE ${lib_count_dec})
344344
endforeach()
345345
if(ENABLE_MULTILIB_HEADER_OPTIMISATION)
346346
string(APPEND multilib_yaml_content " IncludeDirs:\n")
347-
string(APPEND multilib_yaml_content " - ${parent_dir_name}/include\n")
348347
string(APPEND multilib_yaml_content " - ${parent_dir_name}/${variant}/include\n")
348+
string(APPEND multilib_yaml_content " - ${parent_dir_name}/include\n")
349349
endif()
350350
string(APPEND multilib_yaml_content " Group: stdlibs\n")
351351
else()

0 commit comments

Comments
 (0)