git: 57bf75dc7fbd - main - lang/ghc: Pass CC and CXX to Hadrian to fix build in lang/gcc presence.

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=57bf75dc7fbd09e9cacfe6f077876b66bca618de

commit 57bf75dc7fbd09e9cacfe6f077876b66bca618de
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2023-06-24 14:17:13 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2023-06-24 15:03:11 +0000

    lang/ghc: Pass CC and CXX to Hadrian to fix build in lang/gcc presence.
    
    PR:             271928
    Reported by:    John Hein <jcfyecrayz@liamekaens.com>, Mark Evenson <evenson.not.org@gmail.com>
---
 lang/ghc/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 254b9ba7fea3..d230579297d5 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -131,6 +131,7 @@ PLIST_SUB+=		GMP=
 LIB_DEPENDS+=		libffi.so:devel/libffi
 .undef DYNAMIC_CONFIGURE_WITH
 CONFIGURE_ARGS+=	--with-system-libffi --with-ffi-includes=${LOCALBASE}/include --with-ffi-libraries=${LOCALBASE}/lib
+CONFIGURE_ENV+=		CC=${CC} CXX=${CXX}
 SHEBANG_FILES+=		hadrian/bootstrap/bootstrap.py
 HADRIAN_CMD=		${WRKSRC}/hadrian/bootstrap/_build/bin/hadrian ${HADRIAN_DOCS_ARG} ${HADRIAN_GMP_ARG}
 DO_MAKE_BUILD=		${SETENV} ${MAKE_ENV} ${HADRIAN_CMD} ${_MAKE_JOBS} --flavour=ports
@@ -216,8 +217,8 @@ pre-configure:
 	cd ${WRKSRC}/ && ${BOOT_SCRIPT}
 # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
 .if empty(PORT_OPTIONS:MBOOT)
-	cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_INSTALL_DIR}
-	cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install
+	cd ${BOOT_DIR} && ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${BOOT_INSTALL_DIR}
+	cd ${BOOT_DIR} && ${MAKE_CMD} PACKAGES='' install
 .endif
 .ifdef USE_HADRIAN
 # Compile Hadrian
@@ -227,7 +228,7 @@ pre-configure:
 
 .ifdef USE_HADRIAN
 pre-install:
-	cd ${INSTALL_WRKSRC} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${PREFIX}
+	cd ${INSTALL_WRKSRC} && ${CONFIGURE_CMD} ${CONFIGURE_ENV} --prefix=${PREFIX}
 .endif
 
 post-install: