From b1de25f89688307b8117de0546f99bcec4bb3010 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 8 May 2026 20:53:35 +0000
Subject: [PATCH 1/2] Initial plan


From 56dd4d81e1a5fbcda67fdddee5ebc6d92245180b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 8 May 2026 20:58:17 +0000
Subject: [PATCH 2/2] Fix CrossGen2OutputFormat env var not honored at runtime
 in CLRTest.CrossGen.targets

Agent-Logs-Url: https://github.com/jtschuster/runtime/sessions/64af41a7-279a-474b-8c6c-c9f6133bdbdb

Co-authored-by: jtschuster <36744439+jtschuster@users.noreply.github.com>
---
 src/tests/Common/CLRTest.CrossGen.targets | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/tests/Common/CLRTest.CrossGen.targets b/src/tests/Common/CLRTest.CrossGen.targets
index ceaa10324ca08b..9495802026ebe4 100644
--- a/src/tests/Common/CLRTest.CrossGen.targets
+++ b/src/tests/Common/CLRTest.CrossGen.targets
@@ -79,6 +79,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
 
       __cg2ExitCode=0
       __r2rDumpExitCode=0
+      __CrossGen2OutputFormat="${CrossGen2OutputFormat:-$(CrossGen2OutputFormat)}"
 
       RunCrossgen2OnFiles() {
         date +%H:%M:%S
@@ -101,8 +102,8 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         __Command="$_DebuggerFullPath $CORE_ROOT/crossgen2/crossgen2"
         __Command+=" @$__ResponseFile"
         __Command+=" $ExtraCrossGen2Args"
-        if [ -n "$(CrossGen2OutputFormat)" ]; then
-            __Command+=" -f $(CrossGen2OutputFormat)"
+        if [ -n "${__CrossGen2OutputFormat}" ]; then
+            __Command+=" -f ${__CrossGen2OutputFormat}"
         fi
 
         # Expand glob or multiple filenames into array
@@ -151,7 +152,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
         __cg2ExitCode=$?
 
         __linkExitCode=0
-        if [ "$(CrossGen2OutputFormat)" == "macho" ]; then
+        if [ "${__CrossGen2OutputFormat}" == "macho" ]; then
             echo "Linking: $(basename "$__OutputFile") -> $(basename "$__OutputFileFinal")"
             echo  clang -dynamiclib -o "$__OutputFileFinal" "$__OutputFile" -install_name "@rpath/`basename "$__OutputFileFinal"`" -Wl,-dead_strip
             clang -dynamiclib -o "$__OutputFileFinal" "$__OutputFile" -install_name "@rpath/`basename "$__OutputFileFinal"`" -Wl,-dead_strip
@@ -171,7 +172,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
           shopt -s nullglob
           __CompositeExt=".dll"
           __CompositeExtFinal=".dll"
-          if [ "$(CrossGen2OutputFormat)" == "macho" ]; then
+          if [ "${__CrossGen2OutputFormat}" == "macho" ]; then
               __CompositeExt=".o"
               __CompositeExtFinal=".dylib"
           fi