diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-04-23 16:17:32 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-04-23 17:10:30 +0200 |
| commit | 64697db1243ea8cac331d7fd6c9bd055b3102644 (patch) | |
| tree | 7c5fbffa345aee30465c58ce46431358243ebc4e | |
| parent | fdd00d335b21e52b80e8423a072d6f82ca83f1c6 (diff) | |
Port Ben's parallell Makefile hack to VMS
As far as I know, there is no MMS / MMK with parallellism today.
However, it might be added in the future (perhaps in MMK at least), so
we may as well prepare for it now.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3282)
(cherry picked from commit 757264207ad8650a89ea903d48ad89f61d56ea9c)
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index da57049c2d..0cb34c73a4 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -84,6 +84,13 @@ = qq(deassign statem deassign record); } + # This makes sure things get built in the order they need + # to. You're welcome. + sub dependmagic { + my $target = shift; + + return "$target : build_generated\n\t\pipe $(MMS) depend && \$(MMS) _$target\n_$target"; + } #use Data::Dumper; #print STDERR "DEBUG: before:\n", Dumper($unified_info{before}); #print STDERR "DEBUG: after:\n", Dumper($unified_info{after}); @@ -241,24 +248,21 @@ NODEBUG=@ # The main targets ################################################### -all : build_generated, - - build_libs_nodep, build_engines_nodep, build_programs_nodep, - - depend +{- dependmagic('all'); -} : build_libs_nodep, build_engines_nodep, build_programs_nodep +{- dependmagic('build_libs'); -} : build_libs_nodep +{- dependmagic('build_engines'); -} : build_engines_nodep +{- dependmagic('build_programs'); -} : build_programs_nodep -build_libs : build_generated, build_libs_nodep, depend +build_generated : $(GENERATED_MANDATORY) build_libs_nodep : $(LIBS), $(SHLIBS) -build_engines : build_generated, build_engines_nodep, depend build_engines_nodep : $(ENGINES) -build_programs : build_generated, build_programs_nodep, depend build_programs_nodep : $(PROGRAMS), $(SCRIPTS) -build_generated : $(GENERATED_MANDATORY) - # Kept around for backward compatibility build_apps build_tests : build_programs -test tests : build_generated, build_programs_nodep, build_engines_nodep, - - depend +test : tests +{- dependmagic('tests'); -} : build_programs_nodep, build_engines_nodep @ ! {- output_off() if $disabled{tests}; "" -} SET DEFAULT [.test]{- move("test") -} DEFINE SRCTOP {- sourcedir() -} |