Browse Source

NVHPC: Add support for 25.07 no-pie option

Robert Maynard 5 months ago
parent
commit
ea6b29a367
2 changed files with 5 additions and 2 deletions
  1. 0 1
      Modules/Compiler/NVHPC.cmake
  2. 5 1
      Modules/Platform/Linux-NVHPC.cmake

+ 0 - 1
Modules/Compiler/NVHPC.cmake

@@ -16,6 +16,5 @@ macro(__compiler_nvhpc lang)
   set(CMAKE_${lang}_COMPILE_OPTIONS_EXTERNAL_TOOLCHAIN "--gcc-toolchain=")
   set(CMAKE_${lang}_COMPILE_OPTIONS_WARNING_AS_ERROR "-Werror")
 
-
   set(CMAKE_${lang}_LINK_MODE DRIVER)
 endmacro()

+ 5 - 1
Modules/Platform/Linux-NVHPC.cmake

@@ -10,7 +10,11 @@ macro(__linux_compiler_nvhpc lang)
   set(CMAKE_${lang}_COMPILE_OPTIONS_PIE "-fPIE")
   set(_CMAKE_${lang}_PIE_MAY_BE_SUPPORTED_BY_LINKER YES)
   set(CMAKE_${lang}_LINK_OPTIONS_PIE "-fPIE")
-  set(CMAKE_${lang}_LINK_OPTIONS_NO_PIE "")
+  if(CMAKE_${lang}_COMPILER_VERSION VERSION_GREATER_EQUAL 25.07)
+    set(CMAKE_${lang}_LINK_OPTIONS_NO_PIE "-fno-pie")
+  else()
+    set(CMAKE_${lang}_LINK_OPTIONS_NO_PIE "")
+  endif()
   set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")
   set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")
   set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS "")