diff --git a/eng/Subsets.props b/eng/Subsets.props index 73efd1ddb9d1a6..e49f3bbe1d5c67 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -383,6 +383,8 @@ The cross tools are used as part of the build process with the downloaded build tools, so we need to build them for the host architecture and build them as unsanitized binaries. --> + + false <_BuildAnyCrossArch Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)' or '$(HostOS)' != '$(TargetOS)' or '$(TargetsLinuxBionic)' == 'true' or '$(EnableNativeSanitizers)' != '')">true @@ -414,7 +416,7 @@ HostCrossOS=$(HostOS); PgoInstrument=false; NoPgoOptimize=true; - CrossBuild=false; + CrossBuild=$(CrossBuildHostTools); BuildSubdirectory=$(BuildArchitecture); CMakeArgs=$(CMakeArgs) -DCLR_CROSS_COMPONENTS_BUILD=1" UndefineProperties="EnableNativeSanitizers" diff --git a/eng/pipelines/performance/templates/perf-wasm-build-jobs.yml b/eng/pipelines/performance/templates/perf-wasm-build-jobs.yml index 5e70a42c991ad4..4f6172f74ee171 100644 --- a/eng/pipelines/performance/templates/perf-wasm-build-jobs.yml +++ b/eng/pipelines/performance/templates/perf-wasm-build-jobs.yml @@ -31,7 +31,7 @@ jobs: platforms: - browser_wasm jobParameters: - buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:BuildHostTools=true + buildArgs: -s clr+libs+host+packs -c $(_BuildConfig) /p:AotHostArchitecture=x64 /p:AotHostOS=$(_hostedOS) /p:BuildHostTools=true /p:CrossBuildHostTools=true nameSuffix: wasm_coreclr isOfficialBuild: false postBuildSteps: