Skip to content

Commit ac464d2

Browse files
authored
Remove Crossgen2's -O option in Test Builds Wherever Possible (#89223)
* Removed the Crossgen2 -O option from CLRTest.CrossGen.targets file. * Removed the remaining Crossgen2-related -O's I could find. Not sure if all of them should be removed though. * Restored the ReadyToRunCompiler -O option because some NativeAOT tests apparently are not happy without it. * Restored crossgen-corelib.proj's -O because extra-platforms is still complaining. * Restored the -O in a python script to see if Mono stops being an annoying pain. * Restored even the original change just to see whether there is actually a problem with the extra-platforms, or they're just trolling at this point. * Removed the -O's from Crossgen2 again after discovering the extra-platforms pipelines are super broken right now.
1 parent ec8091f commit ac464d2

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/coreclr/crossgen-corelib.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<CrossGenDllCmd>$(CrossGenDllCmd) --targetarch:$(TargetArchitecture)</CrossGenDllCmd>
128128
<CrossGenDllCmd>$(CrossGenDllCmd) --targetos:$(TargetOS)</CrossGenDllCmd>
129129
<CrossGenDllCmd Condition="'$(UsingToolIbcOptimization)' != 'true' and '$(EnableNgenOptimization)' == 'true'">$(CrossGenDllCmd) -m:$(MergedMibcPath) --embed-pgo-data</CrossGenDllCmd>
130-
<CrossGenDllCmd>$(CrossGenDllCmd) -O</CrossGenDllCmd>
131130
<CrossGenDllCmd Condition="'$(Configuration)' == 'Debug' or '$(Configuration)' == 'Checked'">$(CrossGenDllCmd) --verify-type-and-field-layout</CrossGenDllCmd>
132131
<CrossGenDllCmd>$(CrossGenDllCmd) @(CoreLib)</CrossGenDllCmd>
133132
</PropertyGroup>

src/tests/Common/CLRTest.CrossGen.targets

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
***********************************************************************************************
3-
CLRTest.Execute.targets
3+
CLRTest.CrossGen.targets
44
55
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
66
created a backup copy. Incorrect changes to this file will make it
@@ -113,7 +113,6 @@ if [ ! -z ${RunCrossGen2+x} ]%3B then
113113
fi
114114
echo --targetarch:$(TargetArchitecture)>>$__ResponseFile
115115
echo --targetos:$(TargetOS)>>$__ResponseFile
116-
echo -O>>$__ResponseFile
117116
118117
echo "Response file: $__ResponseFile"
119118
cat $__ResponseFile
@@ -263,7 +262,6 @@ if defined RunCrossGen2 (
263262
echo -r:!CORE_ROOT!\xunit.*.dll>>!__ResponseFile!
264263
echo -r:!CORE_ROOT!\mscorlib.dll>>!__ResponseFile!
265264
echo -r:!CORE_ROOT!\netstandard.dll>>!__ResponseFile!
266-
echo -O>>!__ResponseFile!
267265
268266
if not "$(__CreatePdb)" == "" (
269267
echo --pdb>>!__ResponseFile!

0 commit comments

Comments
 (0)