diff options
author | Richard Levitte <levitte@openssl.org> | 2021-04-23 16:19:23 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2021-04-28 21:35:26 +0200 |
commit | 0bd138b8c36c7e8e504beb2c12a2771929c24cfb (patch) | |
tree | 83256ed5e2267bf576ff07f523ffa4459976f86e /Configurations/50-cppbuilder.conf | |
parent | e9b30d9f50a356b3b0a9d60e6fc877e08f68a40e (diff) |
Windows bulding: Make dependency generation not quite as talkative
The modified way to generate .d files had an unfortunate side effect,
that it outputs the whole preprocessed file and not just the dependency
lines, at least with MSVC's cl. That gave util/add-depends.pl a whole
lot more to read through, which impacts greatly on the performance of
dependency treatment.
We modify the process by adding a config target attribute 'make_depend',
which can be any suitable command for generating such lines. All it
needs is to also accept C flags and macro definitions.
Fixes #14994
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/15006)
Diffstat (limited to 'Configurations/50-cppbuilder.conf')
-rw-r--r-- | Configurations/50-cppbuilder.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Configurations/50-cppbuilder.conf b/Configurations/50-cppbuilder.conf index 1c47a4c2be..fad905267b 100644 --- a/Configurations/50-cppbuilder.conf +++ b/Configurations/50-cppbuilder.conf @@ -6,6 +6,10 @@ my %targets = ( thread_scheme => "winthreads", cc => "bcc32c", CPP => "cpp32 -oCON -Sc -Sr", + # -Sx isn't documented, but 'cpp32 -H -S' explains it: + # + # -Sx Omit preprocessed text in output + make_depend => "cpp32 -oCON -Sx -Hp", defines => add("WIN32_LEAN_AND_MEAN", "OPENSSL_SYS_WIN32", "L_ENDIAN", "DSO_WIN32", "_stricmp=stricmp", "_strnicmp=strnicmp", "_malloca=malloc", @@ -18,7 +22,6 @@ my %targets = ( bin_cflags => "-tWC", lib_cflags => shared("-tWD -D_WINDLL -D_DLL"), coutflag => "-o", - cpp_depend_flags => "-Hp", LD => "ilink32", LDFLAGS => picker(default => "-x -Gn -q -w-dup", debug => '-j"$(BDS)\lib\win32c\debug" ' . |