Commit 47852e6a authored by Richard Levitte's avatar Richard Levitte
Browse files

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



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent f6be8315

Configurations/descrip.mms.tmpl

+10 −6
Original line number Diff line number Diff line
@@ -693,10 +693,11 @@ EOF 
      # 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

      # doesn't apply, you're in for a surprise.

      my $write_opt =

      my $write_opt1 =

          join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;

                                 "WRITE OPT_FILE \"$x" } @objs).

          "\"\n\t".

          "\"";

      my $write_opt2 =

          join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;

                             $x =~ s|(\.EXE)|$1/SHARE|;

                             $x =~ s|(\.OLB)|$1/LIB|;
@@ -706,7 +707,8 @@ EOF 
$lib.EXE : $deps

        OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT

        TYPE $engine_opt /OUTPUT=OPT_FILE:

        $write_opt

        $write_opt1

        $write_opt2

        CLOSE OPT_FILE

        LINK /MAP=$lib.MAP /FULL/SHARE=$lib.EXE $lib.OPT/OPT \$(EX_LIBS)

        - PURGE $lib.EXE,$lib.OPT,$lib.MAP
@@ -739,10 +741,11 @@ EOF 
      # 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

      # doesn't apply, you're in for a surprise.

      my $write_opt =

      my $write_opt1 =

          join(",-\"\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;

                                 "WRITE OPT_FILE \"$x" } @objs).

          "\"\n\t".

          "\"";

      my $write_opt2 =

          join("\n\t", map { my $x = $_ =~ /\[/ ? $_ : "[]".$_;

                             $x =~ s|(\.EXE)|$1/SHARE|;

                             $x =~ s|(\.OLB)|$1/LIB|;
@@ -751,7 +754,8 @@ EOF 
      return <<"EOF";

$bin.EXE : $deps

        OPEN/WRITE/SHARE=READ OPT_FILE $bin.OPT

        $write_opt

        $write_opt1

        $write_opt2

        CLOSE OPT_FILE

        LINK/EXEC=$bin.EXE \$(LDFLAGS) $bin.OPT/OPT \$(EX_LIBS)

        - PURGE $bin.EXE,$bin.OPT