X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build.sh;h=97e89bef3da9465b72bee2c26ee26772535e545a;hb=55e8bfbbdb0381868af27a09809e6b36c73b5e84;hp=45ac18a70e5d1546f3bfb49080974e7a3cc7d35f;hpb=aa8e508302816656477d2ba4a1ec691dfb7af9b1;p=platform%2Fupstream%2Fcoreclr.git diff --git a/build.sh b/build.sh index 45ac18a..97e89be 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,7 @@ export ghprbCommentBody= # resolve python-version to use if [ "$PYTHON" == "" ] ; then - if ! PYTHON=$(command -v python3 || command -v python2 || command -v python) + if ! PYTHON=$(command -v python3 || command -v python2 || command -v python || command -v py) then echo "Unable to locate build-dependency python!" 1>&2 exit 1 @@ -47,6 +47,7 @@ usage() echo "-skipnuget - skip building nuget packages." echo "-skiprestoreoptdata - skip restoring optimization data used by profile-based optimizations." echo "-skipcrossgen - skip native image generation" + echo "-skipmanagedtools -- skip build tools such as R2Rdump and RunInContext" echo "-crossgenonly - only run native image generation" echo "-partialngen - build CoreLib as PartialNGen" echo "-verbose - optional argument to enable verbose build output." @@ -60,78 +61,26 @@ usage() echo "-bindir - output directory (defaults to $__ProjectRoot/bin)" echo "-msbuildonunsupportedplatform - build managed binaries even if distro is not officially supported." echo "-numproc - set the number of build processes." + echo "-portablebuild - pass -portablebuild=false to force a non-portable build." + echo "-staticanalyzer - build with clang static analyzer enabled." exit 1 } -initHostDistroRid() -{ - __HostDistroRid="" - if [ "$__HostOS" == "Linux" ]; then - if [ -e /etc/os-release ]; then - source /etc/os-release - if [[ $ID == "rhel" ]]; then - # remove the last version digit - VERSION_ID=${VERSION_ID%.*} - fi - __HostDistroRid="$ID.$VERSION_ID-$__HostArch" - if [[ $ID == "alpine" ]]; then - __HostDistroRid="linux-musl-$__HostArch" - fi - elif [ -e /etc/redhat-release ]; then - local redhatRelease=$(&1 > /dev/null + if [ $? != 0 ] || [ ! -f "${PgoDataPackageVersionOutputFile}" ]; then + echo "Failed to get PGO data package version." + exit $? fi - local OptDataProjectFilePath="$__ProjectRoot/src/.nuget/optdata/optdata.csproj" - __PgoOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpPgoDataPackageVersion /nologo | sed 's/^\s*//') - __IbcOptDataVersion=$(DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $DotNetCli msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion /nologo | sed 's/^[[:blank:]]*//') + + __PgoOptDataVersion=$(<"${PgoDataPackageVersionOutputFile}") + + # Writes into ${IbcDataPackageVersionOutputFile} + ${__ProjectDir}/dotnet.sh msbuild $OptDataProjectFilePath /t:DumpIbcDataPackageVersion ${__CommonMSBuildArgs} /p:IbcDataPackageVersionOutputFile=${IbcDataPackageVersionOutputFile} /nologo 2>&1 > /dev/null + if [ $? != 0 ] || [ ! -f "${IbcDataPackageVersionOutputFile}" ]; then + echo "Failed to get IBC data package version." + exit $? + fi + + __IbcOptDataVersion=$(<"${IbcDataPackageVersionOutputFile}") fi } generate_event_logging_sources() { __OutputDir=$1 - __ConsumingBuildSystem=$2 - - __OutputIncDir="$__OutputDir/src/inc" - __OutputEventingDir="$__OutputDir/eventing" - __OutputEventProviderDir="$__OutputEventingDir/eventprovider" - - echo "Laying out dynamically generated files consumed by $__ConsumingBuildSystem" - echo "Laying out dynamically generated Event test files, etmdummy stub functions, and external linkages" + __OutputEventingDir="$__OutputDir/Eventing" __PythonWarningFlags="-Wall" if [[ $__IgnoreWarnings == 0 ]]; then __PythonWarningFlags="$__PythonWarningFlags -Werror" fi - $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genEventing.py" --inc $__OutputIncDir --dummy $__OutputIncDir/etmdummy.h --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --testdir "$__OutputEventProviderDir/tests" - if [[ $? != 0 ]]; then - exit 1 - fi - - echo "Laying out dynamically generated EventPipe Implementation" - $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genEventPipe.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventingDir/eventpipe" - echo "Laying out dynamically generated EventSource classes" $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genRuntimeEventSources.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventingDir" - - # determine the logging system - case $__BuildOS in - Linux|FreeBSD) - echo "Laying out dynamically generated Event Logging Implementation of Lttng" - $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genLttngProvider.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventProviderDir" - if [[ $? != 0 ]]; then - exit 1 - fi - ;; - *) - echo "Laying out dummy event logging provider" - $PYTHON -B $__PythonWarningFlags "$__ProjectRoot/src/scripts/genDummyProvider.py" --man "$__ProjectRoot/src/vm/ClrEtwAll.man" --intermediate "$__OutputEventProviderDir" - if [[ $? != 0 ]]; then - exit 1 - fi - ;; - esac } generate_event_logging() { # Event Logging Infrastructure - if [[ $__SkipCoreCLR == 0 || $__SkipMSCorLib == 0 || $__ConfigureOnly == 1 ]]; then - generate_event_logging_sources "$__IntermediatesDir" "the native build system" + if [[ $__SkipMSCorLib == 0 ]]; then + generate_event_logging_sources "$__IntermediatesDir" fi } @@ -307,12 +232,14 @@ build_native() __versionSourceFile="$intermediatesForBuild/version.c" if [ $__SkipGenerateVersion == 0 ]; then pwd - "$__ProjectRoot/dotnet.sh" msbuild /nologo /verbosity:minimal /clp:Summary \ - /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /maxcpucount \ - "$__ProjectDir/build.proj" /p:GenerateVersionSourceFile=true /t:GenerateVersionSourceFile /p:NativeVersionSourceFile=$__versionSourceFile \ - $__CommonMSBuildArgs $__UnprocessedBuildArgs + "$__ProjectRoot/eng/common/msbuild.sh" $__ProjectRoot/eng/empty.csproj \ + /p:NativeVersionFile=$__versionSourceFile \ + /p:ArcadeBuild=true /t:GenerateNativeVersionFile /restore \ + $__CommonMSBuildArgs $__UnprocessedBuildArgs + if [ $? -ne 0 ]; then + echo "Failed to generate native version file." + exit $? + fi else # Generate the dummy version.c, but only if it didn't exist to make sure we don't trigger unnecessary rebuild __versionSourceLine="static char sccsid[] __attribute__((used)) = \"@(#)No version information produced\";" @@ -328,12 +255,17 @@ build_native() pushd "$intermediatesForBuild" # Regenerate the CMake solution + scriptDir="$__ProjectRoot/src/pal/tools" if [[ $__GccBuild == 0 ]]; then - echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs" - "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs" + scan_build= + if [[ $__StaticAnalyzer == 1 ]]; then + scan_build=scan-build + fi + echo "Invoking \"$scriptDir/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $scan_build $generator $extraCmakeArguments $__cmakeargs" + source "$scriptDir/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $scan_build $generator "$extraCmakeArguments" "$__cmakeargs" else - echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-gcc.sh\" \"$__ProjectRoot\" $__GccMajorVersion \"$__GccMinorVersion\" $platformArch $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs" - "$__ProjectRoot/src/pal/tools/gen-buildsys-gcc.sh" "$__ProjectRoot" "$__GccMajorVersion" "$__CGccMinorVersion" $platformArch $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs" + echo "Invoking \"$scriptDir/gen-buildsys-gcc.sh\" \"$__ProjectRoot\" $__GccMajorVersion \"$__GccMinorVersion\" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs" + source "$scriptDir/gen-buildsys-gcc.sh" "$__ProjectRoot" "$__GccMajorVersion" "$__CGccMinorVersion" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs" fi popd fi @@ -352,6 +284,10 @@ build_native() # Check that the makefiles were created. pushd "$intermediatesForBuild" + if [ $__StaticAnalyzer == 1 ]; then + buildTool="$SCAN_BUILD_COMMAND $buildTool" + fi + echo "Executing $buildTool install -j $__NumProc" $buildTool install -j $__NumProc @@ -410,10 +346,10 @@ isMSBuildOnNETCoreSupported() if [ "$__HostOS" == "Linux" ]; then __isMSBuildOnNETCoreSupported=1 # note: the RIDs below can use globbing patterns - UNSUPPORTED_RIDS=("debian.9-x64" "ubuntu.17.04-x64") + UNSUPPORTED_RIDS=("ubuntu.17.04-x64") for UNSUPPORTED_RID in "${UNSUPPORTED_RIDS[@]}" do - if [[ $__HostDistroRid == $UNSUPPORTED_RID ]]; then + if [[ ${__DistroRid} == $UNSUPPORTED_RID ]]; then __isMSBuildOnNETCoreSupported=0 break fi @@ -430,6 +366,7 @@ isMSBuildOnNETCoreSupported() build_CoreLib_ni() { local __CrossGenExec=$1 + local __CoreLibILDir=$2 if [ $__PartialNgen == 1 ]; then export COMPlus_PartialNGen=1 @@ -439,8 +376,8 @@ build_CoreLib_ni() rm $__CrossGenCoreLibLog fi echo "Generating native image of System.Private.CoreLib.dll for $__BuildOS.$__BuildArch.$__BuildType. Logging to \"$__CrossGenCoreLibLog\"." - echo "$__CrossGenExec /Platform_Assemblies_Paths $__BinDir/IL $__IbcTuning /out $__BinDir/System.Private.CoreLib.dll $__BinDir/IL/System.Private.CoreLib.dll" - $__CrossGenExec /Platform_Assemblies_Paths $__BinDir/IL $__IbcTuning /out $__BinDir/System.Private.CoreLib.dll $__BinDir/IL/System.Private.CoreLib.dll >> $__CrossGenCoreLibLog 2>&1 + echo "$__CrossGenExec /Platform_Assemblies_Paths $__CoreLibILDir $__IbcTuning /out $__BinDir/System.Private.CoreLib.dll $__CoreLibILDir/System.Private.CoreLib.dll" + $__CrossGenExec /Platform_Assemblies_Paths $__CoreLibILDir $__IbcTuning /out $__BinDir/System.Private.CoreLib.dll $__CoreLibILDir/System.Private.CoreLib.dll >> $__CrossGenCoreLibLog 2>&1 if [ $? -ne 0 ]; then echo "Failed to generate native image for System.Private.CoreLib. Refer to $__CrossGenCoreLibLog" exit 1 @@ -482,13 +419,23 @@ build_CoreLib() __ExtraBuildArgs="$__ExtraBuildArgs /p:BuildManagedTools=true" fi + $__ProjectRoot/dotnet.sh restore /nologo /verbosity:minimal /clp:Summary \ + /p:PortableBuild=true /maxcpucount /p:IncludeRestoreOnlyProjects=true /p:ArcadeBuild=true\ + $__ProjectDir/src/build.proj \ + /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir \ + $__CommonMSBuildArgs $__ExtraBuildArgs $__UnprocessedBuildArgs + + if [ $? -ne 0 ]; then + echo "Failed to restore managed components." + exit 1 + fi + $__ProjectRoot/dotnet.sh msbuild /nologo /verbosity:minimal /clp:Summary \ - /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /maxcpucount \ - $__ProjectDir/build.proj \ + /p:PortableBuild=true /maxcpucount /p:ArcadeBuild=true\ + $__ProjectDir/src/build.proj \ /flp:Verbosity=normal\;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log \ - /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir \ $__CommonMSBuildArgs $__ExtraBuildArgs $__UnprocessedBuildArgs if [ $? -ne 0 ]; then @@ -496,8 +443,16 @@ build_CoreLib() exit 1 fi + local __CoreLibILDir=$__BinDir/IL + if [ $__SkipCrossgen == 1 ]; then echo "Skipping generating native image" + + #if [ $__CrossBuild == 1 ]; then + # Crossgen not performed, so treat the IL version as the final version + cp $__CoreLibILDir/System.Private.CoreLib.dll $__BinDir/System.Private.CoreLib.dll + #fi + return fi @@ -509,21 +464,24 @@ build_CoreLib() # The architecture of host pc must be same architecture with target. if [[ ( "$__HostArch" == "$__BuildArch" ) ]]; then - build_CoreLib_ni "$__BinDir/crossgen" + build_CoreLib_ni "$__BinDir/crossgen" $__CoreLibILDir elif [[ ( "$__HostArch" == "x64" ) && ( "$__BuildArch" == "x86" ) ]]; then - build_CoreLib_ni "$__BinDir/crossgen" + build_CoreLib_ni "$__BinDir/crossgen" $__CoreLibILDir elif [[ ( "$__HostArch" == "arm64" ) && ( "$__BuildArch" == "arm" ) ]]; then - build_CoreLib_ni "$__BinDir/crossgen" + build_CoreLib_ni "$__BinDir/crossgen" $__CoreLibILDir else exit 1 fi else if [[ ( "$__CrossArch" == "x86" ) && ( "$__BuildArch" == "arm" ) ]]; then - build_CoreLib_ni "$__CrossComponentBinDir/crossgen" + build_CoreLib_ni "$__CrossComponentBinDir/crossgen" $__CoreLibILDir elif [[ ( "$__CrossArch" == "x64" ) && ( "$__BuildArch" == "arm" ) ]]; then - build_CoreLib_ni "$__CrossComponentBinDir/crossgen" + build_CoreLib_ni "$__CrossComponentBinDir/crossgen" $__CoreLibILDir elif [[ ( "$__HostArch" == "x64" ) && ( "$__BuildArch" == "arm64" ) ]]; then - build_CoreLib_ni "$__CrossComponentBinDir/crossgen" + build_CoreLib_ni "$__CrossComponentBinDir/crossgen" $__CoreLibILDir + else + # Crossgen not performed, so treat the IL version as the final version + cp $__CoreLibILDir/System.Private.CoreLib.dll $__BinDir/System.Private.CoreLib.dll fi fi } @@ -546,14 +504,12 @@ generate_NugetPackages() echo "DistroRid is "$__DistroRid echo "ROOTFS_DIR is "$ROOTFS_DIR # Build the packages - $__ProjectRoot/dotnet.sh msbuild /nologo /verbosity:minimal /clp:Summary \ - /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ - /p:RestoreDefaultOptimizationDataPackage=false /p:PortableBuild=true \ - /p:UsePartialNGENOptimization=false /maxcpucount \ - $__SourceDir/.nuget/packages.builds \ - /flp:Verbosity=normal\;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log \ - /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:BuildNugetPackages=false /p:UseSharedCompilation=false /p:__DoCrossArchBuild=$__CrossBuild \ - $__CommonMSBuildArgs $__UnprocessedBuildArgs + # Package build uses the Arcade system and scripts, relying on it to restore required toolsets as part of build + $__ProjectRoot/eng/common/build.sh -r -b -projects $__SourceDir/.nuget/packages.builds \ + -verbosity minimal -bl:$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.binlog \ + /p:PortableBuild=true /p:ArcadeBuild=true \ + /p:__IntermediatesDir=$__IntermediatesDir /p:__RootBinDir=$__RootBinDir /p:__DoCrossArchBuild=$__CrossBuild \ + $__CommonMSBuildArgs $__UnprocessedBuildArgs if [ $? -ne 0 ]; then echo "Failed to generate Nuget packages." @@ -661,7 +617,7 @@ __IgnoreWarnings=0 # Set the various build properties here so that CMake and MSBuild can pick them up __ProjectDir="$__ProjectRoot" __SourceDir="$__ProjectDir/src" -__PackagesDir="${DotNetRestorePackagesPath:-${__ProjectDir}/packages}" +__PackagesDir="${DotNetRestorePackagesPath:-${__ProjectDir}/.packages}" __RootBinDir="$__ProjectDir/bin" __UnprocessedBuildArgs= __CommonMSBuildArgs= @@ -691,7 +647,6 @@ __GccBuild=0 __GccMajorVersion=0 __GccMinorVersion=0 __NuGetPath="$__PackagesDir/NuGet.exe" -__HostDistroRid="" __DistroRid="" __cmakeargs="" __SkipGenerateVersion=0 @@ -700,9 +655,10 @@ __msbuildonunsupportedplatform=0 __PgoOptDataVersion="" __IbcOptDataVersion="" __BuildManagedTools=1 -__SkipRestoreArg="" +__SkipRestoreArg="/p:RestoreDuringBuild=true" __SignTypeArg="" __OfficialBuildIdArg="" +__StaticAnalyzer=0 # Get the number of processors available to the scheduler # Other techniques such as `nproc` only get the number of @@ -826,18 +782,45 @@ while :; do __ClangMinorVersion= ;; + clang8|-clang8) + __ClangMajorVersion=8 + __ClangMinorVersion= + ;; + + clang9|-clang9) + __ClangMajorVersion=9 + __ClangMinorVersion= + ;; + + clang10|-clang10) + __ClangMajorVersion=10 + __ClangMinorVersion= + ;; + gcc5|-gcc5) __GccMajorVersion=5 __GccMinorVersion= __GccBuild=1 ;; + gcc6|-gcc6) + __GccMajorVersion=6 + __GccMinorVersion= + __GccBuild=1 + ;; + gcc7|-gcc7) __GccMajorVersion=7 __GccMinorVersion= __GccBuild=1 ;; + gcc8|-gcc8) + __GccMajorVersion=8 + __GccMinorVersion= + __GccBuild=1 + ;; + gcc|-gcc) __GccMajorVersion= __GccMinorVersion= @@ -905,6 +888,10 @@ while :; do __SkipCrossgen=1 ;; + skipmanagedtools | -skipmanagedtools) + __BuildManagedTools=0 + ;; + crossgenonly|-crossgenonly) __SkipMSCorLib=1 __SkipCoreCLR=1 @@ -991,6 +978,10 @@ while :; do __OfficialBuildIdArg="/p:OfficialBuildId=$__Id" ;; + -staticanalyzer) + __StaticAnalyzer=1 + ;; + --) # Skip -Option=Value style argument passing ;; @@ -1003,7 +994,7 @@ while :; do shift done -__CommonMSBuildArgs="/p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__BuildOS=$__BuildOS $__OfficialBuildIdArg $__SignTypeArg $__SkipRestoreArg" +__CommonMSBuildArgs="/p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__BuildOS=$__BuildOS /nodeReuse:false $__OfficialBuildIdArg $__SignTypeArg $__SkipRestoreArg" # Configure environment if we are doing a verbose build if [ $__VerboseBuild == 1 ]; then @@ -1022,29 +1013,14 @@ if [[ $__ClangMajorVersion == 0 && $__ClangMinorVersion == 0 ]]; then fi fi -if [[ "$__BuildArch" == "armel" ]]; then - # Armel cross build is Tizen specific and does not support Portable RID build - __PortableBuild=0 -fi - -if [ $__PortableBuild == 0 ]; then - __CommonMSBuildArgs="$__CommonMSBuildArgs /p:PortableBuild=false" -fi - # Set dependent variables __LogsDir="$__RootBinDir/Logs" __MsbuildDebugLogsDir="$__LogsDir/MsbuildDebugLogs" -# init the host distro name -initHostDistroRid - # Set the remaining variables based upon the determined build configuration __BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" __PackagesBinDir="$__BinDir/.nuget" -__ToolsDir="$__RootBinDir/tools" -__TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType" export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType" -__TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" __isMSBuildOnNETCoreSupported=0 __CrossComponentBinDir="$__BinDir" @@ -1054,6 +1030,21 @@ if [ $__CrossBuild == 1 ]; then fi __CrossGenCoreLibLog="$__LogsDir/CrossgenCoreLib_$__BuildOS.$__BuildArch.$__BuildType.log" +# Configure environment if we are doing a cross compile. +if [ $__CrossBuild == 1 ]; then + export CROSSCOMPILE=1 + if ! [[ -n "$ROOTFS_DIR" ]]; then + export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch" + fi +fi + +# init the target distro name +initTargetDistroRid + +if [ $__PortableBuild == 0 ]; then + __CommonMSBuildArgs="$__CommonMSBuildArgs /p:PortableBuild=false" +fi + # Init if MSBuild for .NET Core is supported for this platform isMSBuildOnNETCoreSupported @@ -1071,17 +1062,6 @@ fi # This is where all built CoreClr libraries will copied to. export __CMakeBinDir="$__BinDir" -# Configure environment if we are doing a cross compile. -if [ $__CrossBuild == 1 ]; then - export CROSSCOMPILE=1 - if ! [[ -n "$ROOTFS_DIR" ]]; then - export ROOTFS_DIR="$__ProjectRoot/cross/rootfs/$__BuildArch" - fi -fi - -# init the target distro name -initTargetDistroRid - # Make the directories necessary for build if they don't exist setup_dirs