root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines 

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-09-21 01:49:53 +02:00
parent f6be8315cb
commit 47852e6ae7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Configurations/descrip.mms.tmpl
View File

@ -693,10 +693,11 @@ EOF
# previous line's file spec as default, so if no directory spec # previous line's file spec as default, so if no directory spec
# is present in the current line and the previous line has one that # is present in the current line and the previous line has one that
# doesn't apply, you're in for a surprise. # doesn't apply, you're in for a surprise.
my $write_opt = my $write_opt1 =
join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
"WRITE OPT_FILE \"$x" } @objs). "WRITE OPT_FILE \"$x" } @objs).
"\"\n\t". "\"";
my $write_opt2 =
join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
$x =~ s|(\.EXE)|$1/SHARE|; $x =~ s|(\.EXE)|$1/SHARE|;
$x =~ s|(\.OLB)|$1/LIB|; $x =~ s|(\.OLB)|$1/LIB|;
@ -706,7 +707,8 @@ EOF
$lib.EXE : $deps $lib.EXE : $deps
OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT
TYPE $engine_opt /OUTPUT=OPT_FILE: TYPE $engine_opt /OUTPUT=OPT_FILE:
$write_opt $write_opt1
$write_opt2
CLOSE OPT_FILE CLOSE OPT_FILE
LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS) LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS)
- PURGE $lib.EXE,$lib.OPT,$lib.MAP - PURGE $lib.EXE,$lib.OPT,$lib.MAP
@ -739,10 +741,11 @@ EOF
# previous line's file spec as default, so if no directory spec # previous line's file spec as default, so if no directory spec
# is present in the current line and the previous line has one that # is present in the current line and the previous line has one that
# doesn't apply, you're in for a surprise. # doesn't apply, you're in for a surprise.
my $write_opt = my $write_opt1 =
join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
"WRITE OPT_FILE \"$x" } @objs). "WRITE OPT_FILE \"$x" } @objs).
"\"\n\t". "\"";
my $write_opt2 =
join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_; join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;
$x =~ s|(\.EXE)|$1/SHARE|; $x =~ s|(\.EXE)|$1/SHARE|;
$x =~ s|(\.OLB)|$1/LIB|; $x =~ s|(\.OLB)|$1/LIB|;
@ -751,7 +754,8 @@ EOF
return <<"EOF"; return <<"EOF";
$bin.EXE : $deps $bin.EXE : $deps
OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT
$write_opt $write_opt1
$write_opt2
CLOSE OPT_FILE CLOSE OPT_FILE
LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS) LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS)
- PURGE $bin.EXE,$bin.OPT - PURGE $bin.EXE,$bin.OPT