diff options
| author | Kai Pastor <dg0yt@darc.de> | 2023-08-05 08:34:35 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-08-29 17:02:31 +0200 |
| commit | 94a48cc9e08820d0b96904ac8c646eefde61e181 (patch) | |
| tree | 2014f3be738fde7d3fccbbc952b8e77cb95696f8 /Configurations | |
| parent | a2699c422d4dd76184532ba92c1495d75a5b9870 (diff) | |
Set VC win64 perlasm scheme during Configure
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21661)
(cherry picked from commit a2608e4bc430d6216bbf36f50a29278e8759103a)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index e8084ab808..aedfa370ca 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -9,19 +9,22 @@ sub vc_win64a_info { $vc_win64a_info = { AS => "nasm", ASFLAGS => "-g", asflags => "-Ox -f win64 -DNEAR", - asoutflag => "-o " }; + asoutflag => "-o ", + perlasm_scheme => "nasm" }; } elsif ($disabled{asm}) { # assembler is still used to compile uplink shim $vc_win64a_info = { AS => "ml64", ASFLAGS => "/nologo /Zi", asflags => "/c /Cp /Cx", - asoutflag => "/Fo" }; + asoutflag => "/Fo", + perlasm_scheme => "masm" }; } else { $die->("NASM not found - make sure it's installed and available on %PATH%\n"); $vc_win64a_info = { AS => "{unknown}", ASFLAGS => "", asflags => "", - asoutflag => "" }; + asoutflag => "", + perlasm_scheme => "auto" }; } } return $vc_win64a_info; @@ -1493,7 +1496,7 @@ my %targets = ( sys_id => "WIN64A", uplink_arch => 'x86_64', asm_arch => 'x86_64', - perlasm_scheme => "auto", + perlasm_scheme => sub { vc_win64a_info()->{perlasm_scheme} }, multilib => "-x64", }, "VC-WIN32" => { |