diff --git a/Modules/Compiler/NVHPC.cmake b/Modules/Compiler/NVHPC.cmake
index 7277459428..ff8808a551 100644
--- a/Modules/Compiler/NVHPC.cmake
+++ b/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()
diff --git a/Modules/Platform/Linux-NVHPC.cmake b/Modules/Platform/Linux-NVHPC.cmake
index f6a0f3db41..c5662d821c 100644
--- a/Modules/Platform/Linux-NVHPC.cmake
+++ b/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 "")