From a17a011d874ea7d67b000f6ed5ae4056b3cbc27c Mon Sep 17 00:00:00 2001 From: David Rohr Date: Thu, 14 Aug 2025 10:12:51 +0200 Subject: [PATCH] GPU CMake: Force using alidist GCC for host compilation of CUDA/HIP code --- dependencies/FindO2GPU.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dependencies/FindO2GPU.cmake b/dependencies/FindO2GPU.cmake index 633d1220575db..032d02aabe5db 100644 --- a/dependencies/FindO2GPU.cmake +++ b/dependencies/FindO2GPU.cmake @@ -10,7 +10,7 @@ # or submit itself to any jurisdiction. # NOTE!!!! - Whenever this file is changed, move it over to alidist/resources -# FindO2GPU.cmake Version 1 +# FindO2GPU.cmake Version 2 if(NOT DEFINED ENABLE_CUDA) set(ENABLE_CUDA "AUTO") @@ -125,6 +125,8 @@ if(ENABLE_CUDA) if(GPUCA_CUDA_GCCBIN) message(STATUS "Using as CUDA GCC version: ${GPUCA_CUDA_GCCBIN}") set(CMAKE_CUDA_HOST_COMPILER "${GPUCA_CUDA_GCCBIN}") + elseif(DEFINED ENV{GCC_TOOLCHAIN_ROOT}) + set(CMAKE_CUDA_HOST_COMPILER "$ENV{GCC_TOOLCHAIN_ROOT}/bin/gcc") endif() enable_language(CUDA) get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES) @@ -278,6 +280,12 @@ if(ENABLE_HIP) endif() endif() if (CMAKE_HIP_COMPILER) + if(GPUCA_HIP_GCCBIN) + message(STATUS "Using as HIP GCC version: ${GPUCA_HIP_GCCBIN}") + set(CMAKE_HIP_HOST_COMPILER "${GPUCA_HIP_GCCBIN}") + elseif(DEFINED ENV{GCC_TOOLCHAIN_ROOT}) + set(CMAKE_HIP_HOST_COMPILER "$ENV{GCC_TOOLCHAIN_ROOT}/bin/gcc") + endif() enable_language(HIP) message(STATUS "HIP language enabled: ${CMAKE_HIP_COMPILER}") endif()