From 47852e6ae763a40ddc3538c76a02be06fd0595a5 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 21 Sep 2016 01:49:53 +0200 Subject: [PATCH] descrip.mms.tmpl: in obj2bin, make sure an empty @deps means no empty lines Reviewed-by: Rich Salz --- Configurations/descrip.mms.tmpl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 0e3e620408..95262fe638 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -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