QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 19:24:37 +00:00
Code Issues Projects Releases Wiki Activity

Port Ben's parallell Makefile hack to Windows

Browse Source 
jom is an nmake clone that does parallell building, via the same -j
argument as GNU make.  To make it work, we need to apply the same
dependeency build up as done in 27c40a93175d4dcb559325db9354910b3d16cd4e

Fixes #3272

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3277)
This commit is contained in:
Richard Levitte 2017-04-22 15:06:35 +02:00
parent 7643a1723e
commit f919c12f5c
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Configurations/windows-makefile.tmpl
View File

@ -47,6 +47,13 @@
return $dso . $dsoext; return $dso . $dsoext;
} }
# 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\$(MAKE) depend && \$(MAKE) _$target\n_$target";
}
''; '';
-} -}
@ -177,23 +184,21 @@ PROCESSOR= {- $config{processor} -}
# The main targets ################################################### # The main targets ###################################################
all: build_generated \ {- dependmagic('all'); -}: build_libs_nodep build_engines_nodep build_programs_nodep
build_libs_nodep build_engines_nodep build_programs_nodep depend {- dependmagic('build_libs'); -}: build_libs_nodep
{- dependmagic('build_engines'); -}: build_engines_nodep
build_libs: build_generated build_libs_nodep depend {- dependmagic('build_programs'); -}: build_programs_nodep
build_libs_nodep: $(LIBS) {- join(" ",map { shlib_import($_) } @{$unified_info{libraries}}) -}
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) build_generated: $(GENERATED_MANDATORY)
build_libs_nodep: $(LIBS) {- join(" ",map { shlib_import($_) } @{$unified_info{libraries}}) -}
build_engines_nodep: $(ENGINES)
build_programs_nodep: $(PROGRAMS) $(SCRIPTS)
# Kept around for backward compatibility # Kept around for backward compatibility
build_apps build_tests: build_programs build_apps build_tests: build_programs
test: tests test: tests
tests: build_generated build_programs_nodep build_engines_nodep depend {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
@rem {- output_off() if $disabled{tests}; "" -} @rem {- output_off() if $disabled{tests}; "" -}
set SRCTOP=$(SRCDIR) set SRCTOP=$(SRCDIR)
set BLDTOP=$(BLDDIR) set BLDTOP=$(BLDDIR)