summaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorEgor Chesakov <Egor.Chesakov@microsoft.com>2018-03-14 23:46:44 (GMT)
committerGitHub <noreply@github.com>2018-03-14 23:46:44 (GMT)
commitffc16020fee4d866de568042fe085143332a2159 (patch)
tree22d8c9232372987568ad1db133e80c58b7adbab0 /build.sh
parent01fe8b7e9e04fdccf485f6c0399ee91dcb881c72 (diff)
downloadcoreclr-ffc16020fee4d866de568042fe085143332a2159.zip
coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.gz
coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.bz2
Include Linux/cross-arch components into NuGet packages (#16859)
* Add __DoCrossArchBuild settings to config.json * HasCrossTargetComponents computes to 'true' on Linux when __DoCrossArchBuild is 1 in dir.props * Include cross-architecture libclrjit.so crossgen into NuGet props files when HasCrossTargetComponents is 'true' * Pass $__DoCrossArchBuild to run.sh when generating NuGet packages in build.sh
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.sh b/build.sh
index 63be11b..51212f3 100755
--- a/build.sh
+++ b/build.sh
@@ -477,7 +477,7 @@ generate_NugetPackages()
echo "DistroRid is "$__DistroRid
echo "ROOTFS_DIR is "$ROOTFS_DIR
# Build the packages
- $__ProjectRoot/run.sh build -Project=$__SourceDir/.nuget/packages.builds -MsBuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log" -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false $__RunArgs $__UnprocessedBuildArgs
+ $__ProjectRoot/run.sh build -Project=$__SourceDir/.nuget/packages.builds -MsBuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log" -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false -__DoCrossArchBuild=$__DoCrossArchBuild $__RunArgs $__UnprocessedBuildArgs
if [ $? -ne 0 ]; then
echo "Failed to generate Nuget packages."