diff options
author | Egor Chesakov <Egor.Chesakov@microsoft.com> | 2018-03-14 16:46:44 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-14 16:46:44 -0700 |
commit | ffc16020fee4d866de568042fe085143332a2159 (patch) | |
tree | 22d8c9232372987568ad1db133e80c58b7adbab0 /build.sh | |
parent | 01fe8b7e9e04fdccf485f6c0399ee91dcb881c72 (diff) | |
download | coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.gz coreclr-ffc16020fee4d866de568042fe085143332a2159.tar.bz2 coreclr-ffc16020fee4d866de568042fe085143332a2159.zip |
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-x | build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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." |