Set the CrossBuild property instead of the CROSSCOMPILE environment variable (#18915)

This commit is contained in:
Jeremy Koritzinsky 2024-03-11 16:03:44 -07:00 committed by GitHub
parent 1907e00d6f
commit b6d8862500
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions

View file

@ -278,7 +278,7 @@ jobs:
if [[ -n "${{ parameters.crossRootFs }}" ]]; then
customEnvVars="$customEnvVars ROOTFS_DIR=${{ parameters.crossRootFs}}"
if [[ '${{ parameters.targetArchitecture }}' != 'wasm' ]]; then
customEnvVars="$customEnvVars CROSSCOMPILE=1"
extraBuildProperties="$extraBuildProperties /p:CrossBuild=true"
fi
fi

View file

@ -0,0 +1,26 @@
From e4cba32b28bac042e53fc6b8a1a9e4126f50f221 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 7 Mar 2024 14:39:30 -0800
Subject: [PATCH] Forward the cross argument from the outer build to the inner
build
Backport: TBD
---
eng/DotNetBuild.props | 1 +
1 file changed, 1 insertion(+)
diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
index a6350c7fea9..127d6a5d12b 100644
--- a/eng/DotNetBuild.props
+++ b/eng/DotNetBuild.props
@@ -54,6 +54,7 @@
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(SourceBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)usemonoruntime</InnerBuildArgs>
+ <InnerBuildArgs Condition="'$(CrossBuild)' == 'true'">$(InnerBuildArgs) $(FlagParameterPrefix)cross</InnerBuildArgs>
<!-- TODO: This parameter is only available on the Unix script. Intentional? -->
<InnerBuildArgs Condition="'$(OS)' != 'Windows_NT'">$(InnerBuildArgs) --outputrid $(TargetRid)</InnerBuildArgs>
<!-- PackageOS and ToolsOS control the rids of prebuilts consumed by the build.
--
2.44.0.windows.1