Skip to content

Fix CrossGen2OutputFormat env var not honored at test runtime in CLRTest.CrossGen.targets #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtschuster merged 2 commits into from
May 8, 2026
Merged

Fix CrossGen2OutputFormat env var not honored at test runtime in CLRTest.CrossGen.targets #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1de25f
Initial plan
Copilot May 8, 2026
56dd4d8
Fix CrossGen2OutputFormat env var not honored at runtime in CLRTest.C…
Copilot May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/tests/Common/CLRTest.CrossGen.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then

__cg2ExitCode=0
__r2rDumpExitCode=0
__CrossGen2OutputFormat="${CrossGen2OutputFormat:-$(CrossGen2OutputFormat)}"

RunCrossgen2OnFiles() {
date +%H:%M:%S
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down