Skip to content

Commit d551abb

Browse files
authored
Invoke crossgen exe when building R2RTest (#111881)
Given the way crossgen is built in-tree, we no longer have crossgen.dll, but rather the actual crossgen executable. Should fix #111878
1 parent 6b47b53 commit d551abb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

eng/pipelines/common/xplat-setup.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ jobs:
7171
value: zip
7272
- name: tarCompression
7373
value: ''
74+
- name: exeExt
75+
value: '.exe'
7476
- name: scriptExt
7577
value: '.cmd'
7678
- name: dir
@@ -91,6 +93,8 @@ jobs:
9193
value: tar
9294
- name: tarCompression
9395
value: gz
96+
- name: exeExt
97+
value: ''
9498
- name: scriptExt
9599
value: '.sh'
96100
- name: dir

eng/pipelines/coreclr/templates/crossgen2-comparison-build-job.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ jobs:
6969
- name: target_crossgen2_os
7070
value: osx
7171
- name: crossgen2location
72-
value: $(productDirectory)$(dir)$(targetFlavor)$(dir)crossgen2$(dir)crossgen2.dll
73-
- ${{ if ne(parameters.archType, 'x64') }}:
74-
- name: crossgen2location
75-
value: $(productDirectory)$(dir)$(targetFlavor)$(dir)x64$(dir)crossgen2$(dir)crossgen2.dll
72+
value: $(binDirectory)$(dir)crossgen2_inbuild$(dir)$(archType)$(dir)$(buildConfigUpper)$(dir)crossgen2.dll
7673
- name: librariesProductDllDir
7774
value: $(Build.SourcesDirectory)$(dir)artifacts$(dir)bin$(dir)runtime$(dir)net10.0-$(osGroup)$(osSubgroup)-$(buildConfig)-$(archType)
7875

src/tests/build.proj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,7 @@
688688
<CrossgenCmd Condition="'$(__CompositeBuildMode)' == ''">$(CrossgenCmd) --crossgen2-parallelism 1</CrossgenCmd>
689689

690690
<CrossgenCmd>$(CrossgenCmd) --verify-type-and-field-layout</CrossgenCmd>
691-
<CrossgenCmd Condition="'$(RunningOnUnix)' == 'true'">$(CrossgenCmd) --crossgen2-path "$(__BinDir)\$(BuildArchitecture)\crossgen2\crossgen2"</CrossgenCmd>
692-
<CrossgenCmd Condition="'$(RunningOnUnix)' != 'true'">$(CrossgenCmd) --crossgen2-path "$(__BinDir)\$(BuildArchitecture)\crossgen2\crossgen2.exe"</CrossgenCmd>
691+
<CrossgenCmd>$(CrossgenCmd) --crossgen2-path "$(__BinDir)\$(BuildArchitecture)\crossgen2\crossgen2$(ExeSuffix)"</CrossgenCmd>
693692
</PropertyGroup>
694693

695694
<Message Importance="High" Text="$(MsgPrefix)Compiling framework using Crossgen2: $(CrossgenCmd)" />

0 commit comments

Comments
 (0)