Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Build on CBL-mariner host with rootfs #84148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 88 commits into from
Apr 12, 2023
Merged

Build on CBL-mariner host with rootfs #84148

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
8735c94
Enable x64 Alpine crossbuild
janvorli Feb 9, 2023
0084966
Set PKG_CONFIG_SYSROOT_DIR
sbomer Feb 22, 2023
bb39763
More build fixes
sbomer Mar 3, 2023
a5f2dbd
test
sbomer Mar 6, 2023
db7bf3e
Print full clang command to show selected linker
sbomer Mar 7, 2023
597a304
Build scripts
sbomer Mar 8, 2023
3e5a366
Fix x64 -> x64 musl cross-build
sbomer Mar 10, 2023
4c369f3
Enable thumb-2 in mono build
sbomer Mar 14, 2023
612c686
Allow cross compiling for x86
sbomer Mar 24, 2023
a9fd083
Enable x86 build with lld
sbomer Mar 24, 2023
d0a1560
Fix x86 mono cross-build
sbomer Mar 24, 2023
2abee9b
Some cleanup
sbomer Mar 24, 2023
54dc641
Add gcc-toolchain arg when aot-ing crossgen
sbomer Mar 24, 2023
2da99a9
Merge remote-tracking branch 'origin/main' into marinerTest
sbomer Mar 27, 2023
825a1d9
Fix AOT compilation of ILCompiler and crossgen2
sbomer Mar 27, 2023
c7468f6
Only pass --gcc-toolchain where required
sbomer Mar 27, 2023
ae6c6ab
Cleanup
sbomer Mar 27, 2023
3d70352
Fix symbol stripping on ci builds
sbomer Mar 29, 2023
2f12a9a
Fix nativeaot test build
sbomer Mar 30, 2023
f6bd3e5
Pick up mariner images, set cross-build arguments
sbomer Mar 30, 2023
e9f17fb
Don't use lld on macos
sbomer Mar 31, 2023
26621ab
Update src/coreclr/pgosupport.cmake
sbomer Mar 31, 2023
39ca0c0
Don't pass clang9
sbomer Mar 31, 2023
220094a
Fix osx linker in tests too
sbomer Mar 31, 2023
d4f71e9
Define separate platform for GCC build
sbomer Mar 31, 2023
d85c7d6
Disable PGO for linux x64 and musl-x64
sbomer Mar 31, 2023
1b3afcb
Build cross tools for x64 and musl-x64
sbomer Mar 31, 2023
938cdf1
Pass crossArg to mono build
sbomer Mar 31, 2023
749ee9c
Pass cross arg in build-test-job.yml
sbomer Mar 31, 2023
6cb0b8e
Fix typo
sbomer Mar 31, 2023
96243bd
Pass through no-PGO arg in global-build-job.yml
sbomer Mar 31, 2023
b84beba
Remove pgoType from job name
sbomer Apr 1, 2023
c9137b3
Pass noPgo arg to native prereqs step
sbomer Apr 2, 2023
d0d3312
Fix crossArg not defined for NativeAOT test build
sbomer Apr 2, 2023
ed0c013
Pass crossBuild through build-test-job.yml
sbomer Apr 2, 2023
2367f3f
Set linker flavor, sysroot in nativeaot library tests
sbomer Apr 2, 2023
a51dbde
Use git diff for AsnXml
sbomer Apr 3, 2023
76c434f
Merge remote-tracking branch 'origin/main' into marinerBuild
sbomer Apr 3, 2023
c30a214
Pass crossBuild through mono's xplat-pipeline-job.yml
sbomer Apr 3, 2023
dd59301
Move crossArg after runtime build params
sbomer Apr 3, 2023
c4c5fa7
Disable PGO from MSBuild instead
sbomer Apr 3, 2023
8a19475
Fix empty container
sbomer Apr 3, 2023
8c41d41
Pass crossArg to mono Build packages step
sbomer Apr 3, 2023
a8cc38d
Fix gcc container definition
sbomer Apr 3, 2023
9aa3527
Use init-compiler.sh for mono cross build
sbomer Apr 3, 2023
cd1f16a
Condition linker selection based on compiler
sbomer Apr 3, 2023
143552e
Fix publish condition
sbomer Apr 4, 2023
04e6182
Pass compilerArg to managed component build
sbomer Apr 4, 2023
47246a3
Use command -v instead of which
sbomer Apr 4, 2023
7ecd081
Use crossArg instead of _crossBuildPropertyArg
sbomer Apr 4, 2023
405fbae
Set mono toolchain for aot build
sbomer Apr 4, 2023
c1da152
Adjust DwarfDump baseline, show expected AOT size
sbomer Apr 4, 2023
9cd348b
Don't use new images for Mono LLVMAot test build
sbomer Apr 4, 2023
d6b0649
Build cross tools when BuildArch != TargetArch
sbomer Apr 4, 2023
8e12626
Fix typo
sbomer Apr 4, 2023
ecd4081
Don't set crossBuild for mono llvmaot
sbomer Apr 5, 2023
028a889
Fix ILCompiler, crossgen invocation for windows
sbomer Apr 6, 2023
7fc39d3
Add PGO instrumentation legs
sbomer Apr 6, 2023
6aa9f0a
Run source-build legs
sbomer Apr 6, 2023
667921b
Pick up arm images
sbomer Apr 7, 2023
cf0ffef
Fix indentation
sbomer Apr 7, 2023
6c0b026
Undo job name change
sbomer Apr 7, 2023
fc9c302
Add linux arm64 libraries build
sbomer Apr 7, 2023
a5e22a0
Don't run AOT'd crossgen that targets musl
sbomer Apr 7, 2023
09f6889
Fix crossgen-corelib logic
sbomer Apr 7, 2023
d23534a
Freeze image versions
sbomer Apr 7, 2023
609f19b
Use existing images for mono arm64 build
sbomer Apr 7, 2023
bedfad7
Don't trigger source-build
sbomer Apr 7, 2023
c708244
Merge remote-tracking branch 'origin/main' into marinerBuild
sbomer Apr 7, 2023
02ec629
Update dwarfdump, size baseline
sbomer Apr 7, 2023
e130eb5
Fix yaml mistakes
sbomer Apr 7, 2023
0fcef90
Update src/tests/nativeaot/SmokeTests/HardwareIntrinsics/X64Baseline.…
sbomer Apr 7, 2023
f1ea8ad
PR feedback
sbomer Apr 8, 2023
04571e5
Fix arm image tags
sbomer Apr 8, 2023
45bb34d
Update src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.…
sbomer Apr 10, 2023
ee57442
Merge remote-tracking branch 'origin/main' into marinerBuild
sbomer Apr 10, 2023
d80a584
Revert "Write linker script for lld to enable gc-sections (#84493)"
sbomer Apr 10, 2023
ddcd261
Update image tags
sbomer Apr 10, 2023
812d284
Revert "Use git diff for AsnXml"
sbomer Apr 10, 2023
e25b5c9
Fix nativeaot libraries test build
sbomer Apr 10, 2023
0fe6ac6
Remove temporary PGO instrumentation legs
sbomer Apr 10, 2023
8406c40
Fix musl_arm tag
sbomer Apr 10, 2023
97a9faf
Remove left-over leg
sbomer Apr 10, 2023
bfad4ea
Merge remote-tracking branch 'origin/main' into marinerBuild
sbomer Apr 11, 2023
018e961
Merge remote-tracking branch 'origin/main' into marinerBuild
sbomer Apr 11, 2023
1e2e056
PR feedback
sbomer Apr 12, 2023
ba6001c
Update src/mono/mono.proj
sbomer Apr 12, 2023
92d1f22
Fix condition for mono aot flags
sbomer Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix ILCompiler, crossgen invocation for windows
  • Loading branch information
@sbomer
sbomer committed Apr 6, 2023
commit 028a88929cbb6c98a69f83eec34c98816b27de70
2 changes: 1 addition & 1 deletion eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<CoreCLRSharedFrameworkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'sharedFramework'))</CoreCLRSharedFrameworkDir>
<CoreCLRCrossgen2Dir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'crossgen2'))</CoreCLRCrossgen2Dir>
<CoreCLRILCompilerDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'ilc-published'))</CoreCLRILCompilerDir>
<CoreCLRCrossILCompilerDir Condition="'$(CrossBuild)' == 'true'">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', '$(BuildArchitecture)', 'ilc'))</CoreCLRCrossILCompilerDir>
<CoreCLRCrossILCompilerDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', '$(BuildArchitecture)', 'ilc'))</CoreCLRCrossILCompilerDir>
<CoreCLRAotSdkDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'aotsdk'))</CoreCLRAotSdkDir>
<CoreCLRBuildIntegrationDir>$([MSBuild]::NormalizeDirectory('$(CoreCLRArtifactsPath)', 'build'))</CoreCLRBuildIntegrationDir>

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/tools/aot/crossgen2/crossgen2.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

<PropertyGroup Condition="'$(NativeAotSupported)' == 'true'">
<IlcToolsPath>$(CoreCLRILCompilerDir)</IlcToolsPath>
<IlcToolsPath Condition="'$(CrossBuild)' == 'true'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
<SysRoot Condition="'$(CrossBuild)' == 'true' and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
<IlcToolsPath Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(CoreCLRCrossILCompilerDir)</IlcToolsPath>
<SysRoot Condition="('$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)') and '$(HostOS)' != 'windows'">$(ROOTFS_DIR)</SysRoot>
<IlcBuildTasksPath>$(CoreCLRILCompilerDir)netstandard/ILCompiler.Build.Tasks.dll</IlcBuildTasksPath>
<IlcSdkPath>$(CoreCLRAotSdkDir)</IlcSdkPath>
<IlcFrameworkPath>$(MicrosoftNetCoreAppRuntimePackRidLibTfmDir)</IlcFrameworkPath>
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Crossgen2.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</Target>

<Target Name="RunPublishedCrossgen" AfterTargets="PublishCrossgen"
Condition="'$(CrossBuild)' != 'true'">
Condition="'$(TargetOS)' == '$(HostOS)' and '$(TargetArchitecture)' == '$(BuildArchitecture)'">
<!-- Run the published crossgen if we're not cross-compiling -->
<Exec Command="@(FilesToPackage) $(CoreCLRArtifactsPath)IL/System.Private.CoreLib.dll --out $(IntermediateOutputPath)S.P.C.tmp" Condition="'%(FileName)%(Extension)' == 'crossgen2$(ExeSuffix)'">
<Output TaskParameter="ExitCode" PropertyName="CrossgenExitCode" />
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/sfx/Microsoft.NETCore.App/ReadyToRun.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<!-- The following property group can be simplified once runtime repo switches over to SDK 6.0 drop -->
<PropertyGroup>
<CrossDir />
<CrossDir Condition="'$(CrossBuild)' == 'true'">$(BuildArchitecture)</CrossDir>
<CrossDir Condition="'$(CrossBuild)' == 'true' or '$(BuildArchitecture)' != '$(TargetArchitecture)'">$(BuildArchitecture)</CrossDir>
<Crossgen2Dll>$(CoreCLRArtifactsPath)\$(CrossDir)\crossgen2\crossgen2.dll</Crossgen2Dll>

<PublishReadyToRunUseCrossgen2>true</PublishReadyToRunUseCrossgen2>
Expand Down