diff options
author | Andy Polyakov <appro@openssl.org> | 2016-03-18 15:45:52 +0100 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2016-03-21 11:44:27 +0100 |
commit | b75ac3c2a3ae8549eb8afb701c1fc7a55c2afdb5 (patch) | |
tree | d86c28653c6f7f87cb35f51d1d2b60b2eaac9de2 /Configurations | |
parent | bb6b950e1c9ae118ba08458645589f815e3bcd90 (diff) |
Build system: VC-WIN64I fixups.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'Configurations')
-rw-r--r-- | Configurations/10-main.conf | 2 | ||||
-rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 459de9cd30..a6efb5725a 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1274,7 +1274,7 @@ sub vc_wince_info { asflags => "-d debug", asoutflag => "-o", sys_id => "WIN64I", - rc4_asm_src => "", + bn_asm_src => sub { my $r=join(" ",@_); $r=~s|bn-ia64.s|bn_asm.c|; $r; }, perlasm_scheme => "ias", }, "VC-WIN64A" => { diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index d2c5eb6214..0b8ac72d58 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -272,7 +272,7 @@ $target: $args{generator}->[0] $deps set ASM=\$(AS) set CC=\$(CC) $generator \$@.S - \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@ + \$(CC) \$(CFLAGS) $incs /EP /C \$@.S > \$@.i && move /Y \$@.i \$@ del /Q \$@.S EOF } @@ -286,7 +286,7 @@ EOF } return <<"EOF"; $target: $args{generator}->[0] $deps - \$(CC) \$(CFLAGS) $incs /EP /C \$< > \$@ + \$(CC) \$(CFLAGS) $incs /EP /C $args{generator}->[0] > \$@.i && move /Y \$@.i \$@ EOF } } |