Skip to content

Testing hwloc cc #1598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lukaszstolarczuk wants to merge 3 commits into from
+25 −6
Closed

Testing hwloc cc #1598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f905e0e
Propagate CMAKE_SYSROOT/gcc-toolchain into hwloc's autotools CC/CXX
wenju-he Jul 27, 2026
4b596c8
format code
wenju-he Jul 27, 2026
37666e8
test nightly
lukaszstolarczuk Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
workflow_dispatch:
schedule:
- cron: '0 4 * * *'
pull_request:

permissions:
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
# pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
28 changes: 23 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,25 @@ if(UMF_LINK_HWLOC_STATICALLY)
# ./configure invocation below, so hwloc would otherwise be built with
# the ambient host compiler instead of the one CMake was configured to
# use (e.g. a sysroot- or toolchain-file-pinned compiler), causing an
# ABI mismatch against the rest of the build.
# ABI mismatch against the rest of the build. CC/CXX are passed as
# space-separated "compiler [flags...]" strings (like CC="ccache gcc"),
# so --sysroot/--gcc-toolchain can be appended directly; make
# word-splits them unquoted when invoking the compiler.
set(UMF_HWLOC_CC "${CMAKE_C_COMPILER}")
set(UMF_HWLOC_CXX "${CMAKE_CXX_COMPILER}")
if(CMAKE_SYSROOT)
string(APPEND UMF_HWLOC_CC " --sysroot=${CMAKE_SYSROOT}")
string(APPEND UMF_HWLOC_CXX " --sysroot=${CMAKE_SYSROOT}")
endif()
if(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN)
string(APPEND UMF_HWLOC_CC
" --gcc-toolchain=${CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN}")
endif()
if(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN)
string(APPEND UMF_HWLOC_CXX
" --gcc-toolchain=${CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN}")
endif()

ExternalProject_Add(
hwloc_targ
PREFIX ${hwloc_targ_PREFIX}
Expand All @@ -338,11 +356,11 @@ if(UMF_LINK_HWLOC_STATICALLY)
UPDATE_DISCONNECTED TRUE
PATCH_COMMAND git apply
${PROJECT_SOURCE_DIR}/cmake/fix_coverity_issues.patch
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env CC=${CMAKE_C_COMPILER}
CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/autogen.sh
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env "CC=${UMF_HWLOC_CC}"
"CXX=${UMF_HWLOC_CXX}" <SOURCE_DIR>/autogen.sh
COMMAND
${CMAKE_COMMAND} -E env CC=${CMAKE_C_COMPILER}
CXX=${CMAKE_CXX_COMPILER} <SOURCE_DIR>/configure
${CMAKE_COMMAND} -E env "CC=${UMF_HWLOC_CC}"
"CXX=${UMF_HWLOC_CXX}" <SOURCE_DIR>/configure
--prefix=<INSTALL_DIR> --enable-static=yes --enable-shared=no
--disable-libxml2 --disable-pci --disable-levelzero
--disable-opencl --disable-cuda --disable-nvml --disable-libudev
Expand Down
Loading