From ffc16020fee4d866de568042fe085143332a2159 Mon Sep 17 00:00:00 2001 From: Egor Chesakov Date: Wed, 14 Mar 2018 16:46:44 -0700 Subject: 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 --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 63be11bb2a..51212f351b 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." -- cgit v1.2.3