diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-03-15 18:06:18 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-03-16 09:33:53 +0100 |
| commit | c39785d4e64587d3a07a8ce8f25046f407107e71 (patch) | |
| tree | da3c07a3cf22c0d530feb5dbd4a1a0a1bd766397 /Configurations/descrip.mms.tmpl | |
| parent | ca1ed2904e9235deb8bf2d32629c6a49b61bf7c0 (diff) | |
Move all dependency post-processing to util/add-depends.pl
In the end, it's more efficient to only have one perl instance (that
loads configdata.pm) dealing with dependency files than running one
(that still loads configdata.pm) for each such file.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5631)
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index cf448aa74a..f6061f16f7 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -505,7 +505,7 @@ distclean : clean depend : descrip.mms descrip.mms : FORCE @ ! {- output_off() if $disabled{makedepend}; "" -} - @ $(PERL) {- sourcefile("util", "add-depends.pl") -} + @ $(PERL) {- sourcefile("util", "add-depends.pl") -} "VMS C" @ ! {- output_on() if $disabled{makedepend}; "" -} # Install helper targets ############################################# @@ -878,12 +878,9 @@ EOF my $incs_on = join("\n\t\@ ", @{$incs_cmds[0]}) || '!'; my $incs_off = join("\n\t\@ ", @{$incs_cmds[1]}) || '!'; my $depbuild = $disabled{makedepend} ? "" - : " /MMS=(FILE=${objd}${objn}.tmp-D,TARGET=$obj.OBJ)"; - my $postprocess_makedepend = - sourcefile("util", "postprocess-makedepend.pl"); - my $objdir = dirname($obj); + : " /MMS=(FILE=${objd}${objn}.D,TARGET=$obj.OBJ)"; - return <<"EOF" + return <<"EOF"; $obj.OBJ : $deps ${before} SET DEFAULT $forward @@ -894,11 +891,6 @@ $obj.OBJ : $deps ${after} - PURGE $obj.OBJ EOF - . ($disabled{makedepend} ? "" : <<"EOF" - \$(PERL) $postprocess_makedepend "VMS C" $objdir < $obj.tmp-D > $obj.d - - DELETE $obj.tmp-D;* -EOF - ); } sub libobj2shlib { my %args = @_; |