git: 026e3d12ba24 - stable/14 - crypto/openssl: fix importing new versions from pristine trees
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 03 Feb 2026 07:37:54 UTC
The branch stable/14 has been updated by ngie:
URL: https://cgit.FreeBSD.org/src/commit/?id=026e3d12ba24188fbe84207e55195defb31bf81a
commit 026e3d12ba24188fbe84207e55195defb31bf81a
Author: Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2025-09-17 05:57:32 +0000
Commit: Enji Cooper <ngie@FreeBSD.org>
CommitDate: 2026-02-03 06:23:58 +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
(cherry picked from commit 52c4b76d1dd385fbe33b78172e39a10749b83d13)
---
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 \