Build hwloc via ExternalProject_Add instead of raw add_custom_command - #1585
Merged
lukaszstolarczuk merged 2 commits intoJul 8, 2026
Merged
Conversation
The static-hwloc autotools build (FetchContent + hand-written add_custom_command chain for autogen.sh/configure/make/make install) never forwarded CC/CXX to hwloc's ./configure, so it silently picked up the ambient host compiler instead of the one CMake was configured to use (e.g. icpx under a sysroot- or toolchain-file-pinned build), risking an ABI mismatch against the rest of the build. Switch to ExternalProject_Add, which fetches/patches/configures/builds/ installs hwloc as a single well-defined external project step and lets us explicitly pass CC/CXX through to configure. The Coverity security patch, previously applied via a post-FetchContent execute_process(), now runs through ExternalProject's PATCH_COMMAND for the non-Windows path. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
bratpiorka
approved these changes
Jul 8, 2026
1 task
lukaszstolarczuk
pushed a commit
that referenced
this pull request
Jul 27, 2026
…1597) PR #1585 forwards CC=${CMAKE_C_COMPILER}/CXX=${CMAKE_CXX_COMPILER} into hwloc's ExternalProject_Add autogen.sh/configure invocation, but those are bare compiler paths with no notion of CMAKE_SYSROOT or CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN. When UMF_LINK_HWLOC_STATICALLY is combined with a sysroot- or toolchain-file-pinned compiler, hwloc still ends up built against the host's headers/libs instead of the sysroot's, which can produce ABI mismatches (e.g. undefined glibc symbols) at final link time. CC/CXX are passed to autotools as space-separated "compiler [flags...]" strings (the same convention as CC="ccache gcc"), so --sysroot and --gcc-toolchain can be appended directly without needing wrapper scripts or touching CMAKE_C_COMPILER/CMAKE_CXX_COMPILER themselves. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The static-hwloc autotools build (FetchContent + hand-written add_custom_command chain for autogen.sh/configure/make/make install) never forwarded CC/CXX to hwloc's ./configure, so it silently picked up the ambient host compiler instead of the one CMake was configured to use (e.g. icpx under a sysroot- or toolchain-file-pinned build), risking an ABI mismatch against the rest of the build.
Switch to ExternalProject_Add, which fetches/patches/configures/builds/ installs hwloc as a single well-defined external project step and lets us explicitly pass CC/CXX through to configure. The Coverity security patch, previously applied via a post-FetchContent execute_process(), now runs through ExternalProject's PATCH_COMMAND for the non-Windows path.
Description
Checklist
ninja testpass locally on Linux