mirror of
https://github.com/opnsense/src.git
synced 2026-06-09 00:32:25 -04:00
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)
This commit is contained in:
parent
fd7ef6a342
commit
c36ac4bded
1 changed files with 6 additions and 1 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
Loading…
Reference in a new issue