Don't use CPP in Configurations/unix-Makefile.tmpl

[openssl.git] / Configurations / 50-masm.conf

diff --git a/Configurations/50-masm.conf b/Configurations/50-masm.conf
index 60a55072f2560644ee4d5b5830c38efe299f97f7..2c55dddc2a0fb4e41d5f025dfe4b9a0130f713d9 100644 (file)
--- a/Configurations/50-masm.conf
+++ b/Configurations/50-masm.conf
@@ -7,11 +7,17 @@
 # proven to be daunting task. This is experimental target, for
 # production builds stick with [up-to-date version of] nasm.
 
-%targets = (
+my %targets = (
     "VC-WIN64A-masm" => {
-        inherit_from    => [ "VC-WIN64A" ],
-        as              => "ml64",
-        asflags         => "/c /Cp /Cx /Zi",
+        inherit_from    => [ "VC-WIN64-common", asm("x86_64_asm"),
+                             sub { $disabled{shared} ? () : "x86_64_uplink" } ],
+        AS              => "ml64",
+        ASFLAGS         => "/nologo /Zi",
         asoutflag       => "/Fo",
+        asflags         => "/c /Cp /Cx",
+        sys_id          => "WIN64A",
+        bn_asm_src      => sub { return undef unless @_;
+                                 my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; },
+        perlasm_scheme   => "masm",
     },
 );