Skip to content

Commit cfd6cd1

Browse files
authored
Fix Linux armv6 build on runtime-community.yml (#74757)
Add missing HOST_ARM define to armv6 in configurecompiler.cmake, it was missed in #73530, before that we defined `HOST_ARM` for armv6 in pal.h too because of `defined(__arm__)` We also only need the `clr.iltools+clr.packages` subset, not all of CoreCLR. Also fix some dependencies that weren't working for FreeBSD since we missed the local variables. We don't need installer subset conditions there but we need to trigger on rolling builds.
1 parent a755524 commit cfd6cd1

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

eng/native/configurecompiler.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ elseif (CLR_CMAKE_HOST_ARCH_ARM)
220220
add_definitions(-DHOST_ARM)
221221
elseif (CLR_CMAKE_HOST_ARCH_ARMV6)
222222
set(ARCH_HOST_NAME armv6)
223+
add_definitions(-DHOST_ARM)
223224
add_definitions(-DHOST_ARMV6)
224225
elseif (CLR_CMAKE_HOST_ARCH_ARM64)
225226
set(ARCH_HOST_NAME arm64)

eng/pipelines/runtime-community.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
or(
6666
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
6767
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
68-
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
6968
eq(variables['isRollingBuild'], true))
7069
# extra steps, run tests
7170
extraStepsTemplate: /eng/pipelines/libraries/helix.yml
@@ -89,6 +88,12 @@ jobs:
8988
runtimeFlavor: mono
9089
platforms:
9190
- FreeBSD_x64
91+
variables:
92+
# map dependencies variables to local variables
93+
- name: librariesContainsChange
94+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
95+
- name: monoContainsChange
96+
value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ]
9297
jobParameters:
9398
testScope: innerloop
9499
nameSuffix: AllSubsets_Mono
@@ -98,7 +103,7 @@ jobs:
98103
or(
99104
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
100105
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
101-
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true))
106+
eq(variables['isRollingBuild'], true))
102107
103108
#
104109
# Build the whole product using Mono and run libraries tests
@@ -120,13 +125,12 @@ jobs:
120125
jobParameters:
121126
testScope: innerloop
122127
nameSuffix: AllSubsets_Mono
123-
buildArgs: -s mono+clr+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
128+
buildArgs: -s mono+clr.iltools+clr.packages+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
124129
timeoutInMinutes: 120
125130
condition: >-
126131
or(
127132
eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
128133
eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true),
129-
eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true),
130134
eq(variables['isRollingBuild'], true))
131135
${{ if eq(variables['isRollingBuild'], true) }}:
132136
# extra steps, run tests

0 commit comments

Comments
 (0)