X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Fdescrip.mms.tmpl;h=b2ae05946806b07514422489fa744efc6369c3ba;hp=32c8d1a3ac5c96c2a28e7e76b86aa14e1c52c2a1;hb=b54e35f6cd9a9de3962daa0112e33bd178c49f6d;hpb=921de151d2052c794cf6ad82fe76da92717577f7 diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 32c8d1a3ac..b2ae059468 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -448,12 +448,19 @@ EOF my $srcs = join(", ", map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}}); - my $incs = - "/INCLUDE=(".join(",", - map { - file_name_is_absolute($_) - ? $_ : catdir($backward,$_) - } @{$args{incs}}).")"; + my $incs_on = "\@ !"; + my $incs_off = "\@ !"; + my $incs = ""; + if (@{$args{incs}}) { + $incs_on = + "DEFINE tmp_includes " + .join(",-\n\t\t\t", map { + file_name_is_absolute($_) + ? $_ : catdir($backward,$_) + } @{$args{incs}}); + $incs_off = "DEASSIGN tmp_includes"; + $incs = " /INCLUDE=(tmp_includes:)"; + } my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !"; my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !"; my $depbuild = $disabled{makedepend} ? "" @@ -463,7 +470,9 @@ EOF $obj.OBJ : $deps ${before} SET DEFAULT $forward + $incs_on \$(CC) \$(CFLAGS)${incs}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs + $incs_off SET DEFAULT $backward ${after} \@ PIPE ( \$(PERL) -e "use File::Compare qw/compare_text/; my \$x = compare_text(""$obj.MMS"",""$obj.tmp-MMS""); exit(0x10000000 + (\$x == 0));" || -