Handle -DRUNTIMES_default_

jhuber6 · jhuber6 · commit 2082d8220aac · 2025-09-12T16:50:19.000-05:00
diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt
@@ -298,8 +298,19 @@ function(runtime_register_target name)
   list(APPEND ${name}_extra_args -DLLVM_USE_LINKER=${LLVM_USE_LINKER})
 
   get_cmake_property(variable_names VARIABLES)
+  set(normalized_variable_names "")
+  foreach(var ${variable_names})
+    if(var MATCHES "^RUNTIMES_default_")
+      string(REPLACE "RUNTIMES_default_" "RUNTIMES_${LLVM_DEFAULT_TARGET_TRIPLE}_" normalized_var "${var}")
+      set(${normalized_var} "${${var}}")
+      list(APPEND normalized_variable_names "${normalized_var}")
+    else()
+      list(APPEND normalized_variable_names "${var}")
+    endif()
+  endforeach()
+
   foreach(extra_name IN ITEMS ${ARG_BASE_NAME} ${name})
-    foreach(variable_name ${variable_names})
+    foreach(variable_name ${normalized_variable_names})
       string(FIND "${variable_name}" "RUNTIMES_${extra_name}_" out)
       if("${out}" EQUAL 0)
         string(REPLACE "RUNTIMES_${extra_name}_" "" new_name ${variable_name})
