From eddf66eaef2d2fd0bdc65c5ce94aeef692e9abea Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 19 Mar 2025 13:12:57 -0400
Subject: [PATCH] CMakeDetermineASMCompiler: De-duplicate list of compiler info
 variables

---
 Modules/CMakeDetermineASMCompiler.cmake      | 42 ++++++++------------
 Modules/Internal/CMakeInspectASMLinker.cmake |  3 ++
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake
index c4b460364e..59f5558a2b 100644
--- a/Modules/CMakeDetermineASMCompiler.cmake
+++ b/Modules/CMakeDetermineASMCompiler.cmake
@@ -238,18 +238,6 @@ else()
   message(STATUS "Didn't find assembler")
 endif()
 
-foreach(_var
-    COMPILER
-    COMPILER_ID
-    COMPILER_ARG1
-    COMPILER_ENV_VAR
-    COMPILER_AR
-    COMPILER_RANLIB
-    COMPILER_VERSION
-    )
-  set(_CMAKE_ASM_${_var} "${CMAKE_ASM${ASM_DIALECT}_${_var}}")
-endforeach()
-
 if(CMAKE_ASM${ASM_DIALECT}_COMPILER_SYSROOT)
   string(CONCAT _SET_CMAKE_ASM_COMPILER_SYSROOT
     "set(CMAKE_ASM${ASM_DIALECT}_COMPILER_SYSROOT \"${CMAKE_ASM${ASM_DIALECT}_COMPILER_SYSROOT}\")\n"
@@ -273,17 +261,19 @@ else()
 endif()
 
 # configure variables set in this file for fast reload later on
-configure_file(${CMAKE_ROOT}/Modules/CMakeASMCompiler.cmake.in
-  ${CMAKE_PLATFORM_INFO_DIR}/CMakeASM${ASM_DIALECT}Compiler.cmake @ONLY)
-
-foreach(_var
-    COMPILER
-    COMPILER_ID
-    COMPILER_ARG1
-    COMPILER_ENV_VAR
-    COMPILER_AR
-    COMPILER_RANLIB
-    COMPILER_VERSION
-    )
-  unset(_CMAKE_ASM_${_var})
-endforeach()
+block()
+  foreach(_var IN ITEMS
+      # Keep in sync with Internal/CMakeTestASMLinker.
+      COMPILER
+      COMPILER_ID
+      COMPILER_ARG1
+      COMPILER_ENV_VAR
+      COMPILER_AR
+      COMPILER_RANLIB
+      COMPILER_VERSION
+      )
+    set(_CMAKE_ASM_${_var} "${CMAKE_ASM${ASM_DIALECT}_${_var}}")
+  endforeach()
+  configure_file(${CMAKE_ROOT}/Modules/CMakeASMCompiler.cmake.in
+    ${CMAKE_PLATFORM_INFO_DIR}/CMakeASM${ASM_DIALECT}Compiler.cmake @ONLY)
+endblock()
diff --git a/Modules/Internal/CMakeInspectASMLinker.cmake b/Modules/Internal/CMakeInspectASMLinker.cmake
index 3f256765ef..8d7a39ba6c 100644
--- a/Modules/Internal/CMakeInspectASMLinker.cmake
+++ b/Modules/Internal/CMakeInspectASMLinker.cmake
@@ -4,6 +4,8 @@
 # Re-configure to save learned information.
 block()
   foreach(_var IN ITEMS
+      # Compiler information.
+      # Keep in sync with CMakeDetermineASMCompiler.
       COMPILER
       COMPILER_ID
       COMPILER_ARG1
@@ -11,6 +13,7 @@ block()
       COMPILER_AR
       COMPILER_RANLIB
       COMPILER_VERSION
+      # Linker information.
       COMPILER_LINKER
       COMPILER_LINKER_ID
       COMPILER_LINKER_VERSION