The branch master has been updated
via 387bbce45bfe9c0bccbd2c84206ca7719d463740 (commit)
from a6105ef40d65b35818f2b8ae8ca9e57ca6956d1d (commit)
- Log -----------------------------------------------------------------
commit 387bbce45bfe9c0bccbd2c84206ca7719d463740
Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com>
Date: Sat Sep 21 00:01:04 2019 +0200
Configure: add missing dependency to fix parallel builds on Windows
The issue was encountered when testing parallel builds of OpenSSL on
Windows using `jom` instead of `nmake`. The builds persistently failed
with the following error message because the generated file "buildinf.h"
did not exist yet.
crypto\info.c(15): fatal error C1083:
cannot open include file: "buildinf.h": No such file or directory
Apparently this error does not occur on Linux because `make` parallelizes
the builds differently such that `crypto\cversion.c`, which has an
explicit dependency on `buildinf.h`, gets compiled first. Also, the
include dependency was added only recently in commit 096978f0990.
Reviewed-by: Richard Levitte <levi...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9960)
-----------------------------------------------------------------------
Summary of changes:
crypto/build.info | 1 +
1 file changed, 1 insertion(+)
diff --git a/crypto/build.info b/crypto/build.info
index 6c77f95108..5d3b123d69 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -82,6 +82,7 @@ SOURCE[../providers/fips]=$UTIL_COMMON
DEFINE[../providers/fips]=$UTIL_DEFINE
+DEPEND[info.o]=buildinf.h
DEPEND[cversion.o]=buildinf.h
GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)"
"$(PLATFORM)"
DEPEND[buildinf.h]=../configdata.pm
