git: 52c4b76d1dd3 - main - crypto/openssl: fix importing new versions from pristine trees
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 21 Sep 2025 22:36:41 UTC
The branch main has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=52c4b76d1dd385fbe33b78172e39a10749b83d13
commit 52c4b76d1dd385fbe33b78172e39a10749b83d13
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2025-09-17 05:57:32 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2025-09-21 22:36:24 +0000
crypto/openssl: fix importing new versions from pristine trees
Prior to this change, CC was not being passed through to Configure,
which was resulting in failures when Configure was running compiler
checks.
Pass through CC via `WRK_ENV` to Configure so the compiler is defined
properly as part of the initial build.
MFC after: 1 month
Fixes: d18058b7b850 ("crypto/openssl: apply polish to new vendor import process")
Differential Revision: https://reviews.freebsd.org/D52595
---
crypto/openssl/BSDmakefile | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/crypto/openssl/BSDmakefile b/crypto/openssl/BSDmakefile
index 514c87ae3a8e..d260808ffac3 100644
--- a/crypto/openssl/BSDmakefile
+++ b/crypto/openssl/BSDmakefile
@@ -12,7 +12,9 @@ LCRYPTO_SRC= ${SRCTOP}/crypto/openssl
LCRYPTO_DOC= ${LCRYPTO_SRC}/doc
CAT?= /bin/cat
+CC?= cc
GMAKE?= gmake
+LD?= ld
MV?= /bin/mv
PERL?= perl
SETENVI= /usr/bin/env -i
@@ -26,10 +28,13 @@ CONFIGURATION_H_ORIG= ${CONFIGURATION_H}.orig
.ORDER: configure patch all
LOCALBASE= /usr/local
-WRK_ENV= PATH=${LOCALBASE}/bin:/bin:/usr/bin
+WRK_ENV= CC=${CC} \
+ LD=${LD} \
+ PATH=${LOCALBASE}/bin:/bin:/usr/bin
configure:
@(cd ${.CURDIR} && ${SETENVI} \
+ ${WRK_ENV} \
${PERL} ./Configure \
disable-aria \
disable-egd \