mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-19 20:09:28 +08:00
40 lines
1.8 KiB
Diff
40 lines
1.8 KiB
Diff
|
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
|
||
|
|
index e8084ab..263ecd0 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" => {
|