diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-02-25 11:14:28 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-03-31 15:33:20 +0200 |
| commit | f4c88073091592b1ff92ba12c894488ff7d03ece (patch) | |
| tree | d9d03a6361c74a8803b431adcfe4c4c2b3a277e0 /Configurations | |
| parent | a70535f84902b8d86c16ef3fe9d570b96fa5cfce (diff) | |
Windows makefile generator: Don't delete long lists of files in one go
The Windows command line has its limits, and we're hitting it hard.
We therefore generate one 'del' command for each explicit file for the
'clean' target.
Fixes #11163
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/11171)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index c49b32f0e1..043839977c 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -47,19 +47,22 @@ SHLIB_VERSION_NUMBER={- $config{shlib_version} -} LIBS={- join(" ", map { ( platform->sharedlib_import($_), platform->staticlib($_) ) } @{$unified_info{libraries}}) -} SHLIBS={- join(" ", map { platform->sharedlib($_) // () } @{$unified_info{libraries}}) -} SHLIBPDBS={- join(" ", map { platform->sharedlibpdb($_) // () } @{$unified_info{libraries}}) -} -MODULES={- join(" ", map { platform->dso($_) } @{$unified_info{modules}}) -} +MODULES={- our @MODULES = map { platform->dso($_) } @{$unified_info{modules}}; + join(" ", @MODULES) -} MODULEPDBS={- join(" ", map { platform->dsopdb($_) } @{$unified_info{modules}}) -} PROGRAMS={- our @PROGRAMS = map { platform->bin($_) } @{$unified_info{programs}}; join(" ", @PROGRAMS) -} PROGRAMPDBS={- join(" ", map { $_.".pdb" } @{$unified_info{programs}}) -} -SCRIPTS={- join(" ", @{$unified_info{scripts}}) -} +SCRIPTS={- our @SCRIPTS = @{$unified_info{scripts}}; join(" ", @SCRIPTS) -} {- output_off() if $disabled{makedepend}; "" -} DEPS={- join(" ", map { platform->isobj($_) ? platform->dep($_) : () } grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } keys %{$unified_info{sources}}); -} {- output_on() if $disabled{makedepend}; "" -} -GENERATED_MANDATORY={- join(" ", @{$unified_info{depends}->{""}} ) -} +GENERATED_MANDATORY={- our @GENERATED_MANDATORY = @{$unified_info{depends}->{""}}; + join(" ", @GENERATED_MANDATORY) -} GENERATED={- # common0.tmpl provides @generated - join(" ", map { platform->convertext($_) } @generated) -} + our @GENERATED = map { platform->convertext($_) } @generated; + join(" ", @GENERATED) -} INSTALL_LIBS={- join(" ", map { quotify1(platform->sharedlib_import($_) @@ -417,10 +420,10 @@ clean: libclean -rmdir /Q /S $(HTMLDOCS5_BLDDIRS) -rmdir /Q /S $(HTMLDOCS7_BLDDIRS) {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -} - -del /Q /F $(MODULES) - -del /Q /F $(SCRIPTS) - -del /Q /F $(GENERATED_MANDATORY) - -del /Q /F $(GENERATED) + {- join("\n\t", map { "-del /Q /F $_" } @MODULES) -} + {- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) -} + {- join("\n\t", map { "-del /Q /F $_" } @GENERATED_MANDATORY) -} + {- join("\n\t", map { "-del /Q /F $_" } @GENERATED) -} -del /Q /S /F *.d *.obj *.pdb *.ilk *.manifest -del /Q /S /F engines\*.lib engines\*.exp -del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp |