diff options
| author | Mathias Berchtold <mberchtold@gmail.com> | 2023-05-02 16:58:02 -0600 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-05-05 17:13:33 +0100 |
| commit | 639e3970d0f1022c9cd15c4ff45845d7e9d65bbc (patch) | |
| tree | 74e144e3d76486ace482af2e7bfa7e23eca241b1 /Configurations | |
| parent | 849ed515c7838943eab42de5c29d6a1f91079a11 (diff) | |
Revert "win-onecore: Build with /APPCONTAINER for UWP compat"
This reverts commit 2c61a670ebf2f1923a3bd2ef0ee4b2fa6261eaeb.
Not all OneCore based SKUs (or editions) of Windows (Server, XBOX, etc) require /APPCONTAINER. The /APPCONTAINER link option is only relevant for Universal Windows Platform (UWP) apps for which there are already dedicated configurations (VC-WIN32-UWP, VC-WIN64A-UWP, etc) where the /APPCONTAINER link option is added.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20872)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/50-win-onecore.conf | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Configurations/50-win-onecore.conf b/Configurations/50-win-onecore.conf index efa2c837bc..91e77b663f 100644 --- a/Configurations/50-win-onecore.conf +++ b/Configurations/50-win-onecore.conf @@ -36,14 +36,13 @@ my %targets = ( # /NODEFAULTLIB:kernel32.lib is needed, because MSVCRT.LIB has # hidden reference to kernel32.lib, but we don't actually want # it in "onecore" build. - # /APPCONTAINER is needed for Universal Windows Platform compat - lflags => add("/NODEFAULTLIB:kernel32.lib /APPCONTAINER"), + lflags => add("/NODEFAULTLIB:kernel32.lib"), defines => add("OPENSSL_SYS_WIN_CORE"), ex_libs => "onecore.lib", }, "VC-WIN64A-ONECORE" => { inherit_from => [ "VC-WIN64A" ], - lflags => add("/NODEFAULTLIB:kernel32.lib /APPCONTAINER"), + lflags => add("/NODEFAULTLIB:kernel32.lib"), defines => add("OPENSSL_SYS_WIN_CORE"), ex_libs => "onecore.lib", }, @@ -69,7 +68,7 @@ my %targets = ( defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", "OPENSSL_SYS_WIN_CORE"), bn_ops => "BN_LLONG RC4_CHAR", - lflags => add("/NODEFAULTLIB:kernel32.lib /APPCONTAINER"), + lflags => add("/NODEFAULTLIB:kernel32.lib"), ex_libs => "onecore.lib", multilib => "-arm", }, @@ -78,7 +77,7 @@ my %targets = ( defines => add("_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE", "OPENSSL_SYS_WIN_CORE"), bn_ops => "SIXTY_FOUR_BIT RC4_CHAR", - lflags => add("/NODEFAULTLIB:kernel32.lib /APPCONTAINER"), + lflags => add("/NODEFAULTLIB:kernel32.lib"), ex_libs => "onecore.lib", multilib => "-arm64", }, |