Skip to content
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

Enable building .dll if both 'CustomNativeMain' and 'NativeLib' are set #103504

Merged
merged 11 commits into from
Jul 20, 2024
Merged

Enable building .dll if both 'CustomNativeMain' and 'NativeLib' are set #103504

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
358eda1
Build a .dll if 'CustomNativeMain' is set
Sergio0694 Jun 15, 2024
e539a5b
Merge the stack size linker arg
Sergio0694 Jun 15, 2024
853789c
Switch on 'NativeLib' instead for .exe args
Sergio0694 Jun 15, 2024
d7d2b30
Update Microsoft.NETCore.Native.Unix.targets
Sergio0694 Jun 15, 2024
b63a47a
Simplify linker subsystem and .exe args
Sergio0694 Jun 15, 2024
d469bbd
Revert changes to Unix .targets
Sergio0694 Jun 15, 2024
859cde1
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
jkotas Jun 16, 2024
20c4b52
Update src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Nativ…
jkotas Jun 16, 2024
26a094b
Update Microsoft.NETCore.Native.Windows.targets
MichalStrehovsky Jun 19, 2024
38ba69d
Merge branch 'main' into user/sergiopedri/shim-exe
Sergio0694 Jul 19, 2024
0371700
Actually output a .dll if 'NativeLib' is set
Sergio0694 Jul 19, 2024
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
7 changes: 3 additions & 4 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ The .NET Foundation licenses this file to you under the MIT license.
<FullRuntimeName>Runtime.WorkstationGC</FullRuntimeName>
<FullRuntimeName Condition="'$(ServerGarbageCollection)' == 'true' or '$(IlcLinkServerGC)' == 'true' or '$(ControlFlowGuard)' == 'Guard'">Runtime.ServerGC</FullRuntimeName>
<BootstrapperName>bootstrapper</BootstrapperName>
<BootstrapperName Condition="'$(NativeLib)' != '' or '$(CustomNativeMain)' == 'true'">bootstrapperdll</BootstrapperName>
<BootstrapperName Condition="'$(NativeLib)' != ''">bootstrapperdll</BootstrapperName>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jkotas should we also keep this condition like in the Unix file? As in, is the bootstrapper .dll always going to be used when a custom main is used, regardless of whether the native binary being produced is actually a .dll or an .exe?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the Windows and Unix should be in sync.

<VxSortSupportName>Runtime.VxsortEnabled</VxSortSupportName>
<VxSortSupportName Condition="'$(ControlFlowGuard)' != 'Guard' and ('$(OptimizationPreference)' == 'Size' or '$(IlcDisableVxsort)' == 'true')">Runtime.VxsortDisabled</VxSortSupportName>
<StandaloneGCSupportName>standalonegc-disabled</StandaloneGCSupportName>
Expand Down Expand Up @@ -91,12 +91,11 @@ The .NET Foundation licenses this file to you under the MIT license.
<LinkerArg Condition="$(NativeDebugSymbols) == 'true'" Include="/DEBUG" />
<!-- The runtime is not compatible with jump stubs inserted by incremental linking. -->
<LinkerArg Include="/INCREMENTAL:NO" />
<LinkerArg Condition="'$(LinkerSubsystem)' != ''" Include="/SUBSYSTEM:$(LinkerSubsystem)" />
<LinkerArg Condition="'$(OutputType)' == 'WinExe' or '$(OutputType)' == 'Exe'" Include="/ENTRY:$(EntryPointSymbol) /NOEXP /NOIMPLIB" />
<LinkerArg Condition="''$(NativeLib)' == '' and $(LinkerSubsystem)' != ''" Include="/SUBSYSTEM:$(LinkerSubsystem)" />
<LinkerArg Condition="'$(NativeLib)' == ''" Include="/ENTRY:$(EntryPointSymbol) /NOEXP /NOIMPLIB /STACK:$(IlcDefaultStackSize)" />
<LinkerArg Include="/NATVIS:&quot;$(MSBuildThisFileDirectory)NativeAOT.natvis&quot;" />
<LinkerArg Condition="'$(ControlFlowGuard)' == 'Guard'" Include="/guard:cf" />
<LinkerArg Condition="'$(_targetArchitecture)' == 'x86'" Include="/safeseh" />
<LinkerArg Condition="'$(OutputType)' == 'WinExe' or '$(OutputType)' == 'Exe'" Include="/STACK:$(IlcDefaultStackSize)" />
<!-- Do not warn if someone declares UnmanagedCallersOnly with an entrypoint of 'DllGetClassObject' and similar -->
<LinkerArg Include="/IGNORE:4104" />
</ItemGroup>
Expand Down
Loading