From nobody Sat Jun 24 15:03:15 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpHRR58CTz4gtxM; Sat, 24 Jun 2023 15:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpHRR2DJ6z3j6T; Sat, 24 Jun 2023 15:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687618995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/IQY07BH0+o64k0ydO7QIo0wrf66GcC7ZSbPxvrIjmY=; b=OKVFELuWkdX7VCbk9yspRBLd8VRkZKTBNrGvHabDM8LzbwvdD56rKV54GFdo4ygxKj4qEm SyTGK5O4JIzjAA0NVoh0G254VAU6WnZktDWqYTmYeTnIRZwLZvguC9MNhQV55GV7b3gx7a xfFp1PmJ8nvVC2/kbQ/0vZoLx9xgCX+gLyPyT80KP91tVEaWh4CAgCetBpX6u8riQ2GmqX KPxfFY5z1bD+pJk685Baq1V3jPQiTuoZJqGoKjaGsCGozQ94glW2RyofRcAcID/r/ocxvA my7XM9jdHrF5g4o1JT5Vr3mpxVdBfKxkLCAppGng6Oir/80uYQCT8qhApjYm+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687618995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/IQY07BH0+o64k0ydO7QIo0wrf66GcC7ZSbPxvrIjmY=; b=t9C5YzCLw/dGvrETqTVQh8YdkbdVzFppUMF/PpCFAHRZXeqwuGeJ9gSHXPVHKkOpaku07p Vfse1ywOo0nPXbfnvziKsSShqDj9MI+9Y1R7NES/xQTTx3U5Fa897rU4XMmoTnVcnEGqB9 h0rRUCIYZ1Wb/hpuuCkOcU/Ch4BAQv6ik5CZ6PgYf0RqdjFqo1wEmPReTHaoE95/m0cm1T WTVSeWOUQhxD2uxv2pXW8X6TxktWfzb3S5lAjs4QLIHsndtHzXKcAQ7fbO6eqy3vt4m/88 C5KRWY4V0GSkfYiU4YViiMYvbnWQRFkYn5jV9pH7BNKxMj7AjHGeWPzwpda+9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687618995; a=rsa-sha256; cv=none; b=ZDHwwax3u4yFO6NAQcI30tV5zHMjroigrYYhuKN+MzblEMsc55JZZ5/nfGI/RqrZMXmmOO ygkLsKyU8rwRx8CrUioVwtqkZMGfgL0fsUQKiHcHhlaeh+9NRl6gfnHxP3mIt/88bElc7S zgJduROcgabKtoBe+bkQb4xLTwqB1Q/Inpv6U4VJJwws/DgO9IRuyyPuZl5cBX3kc+bG74 RxMpIfrnDhSMLXpQ61lzsr1GD7zmiz4CejVa/pn2yBP3ehpZMRfeNVttHcgRGjZVmrS7o0 V3GsKb7GTlIM8xikL/H3gxrCEDLm5uke05hF5IMKwJIdS5qxP+0C/ZxmUldWeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QpHRR1J97zr0Q; Sat, 24 Jun 2023 15:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OF3FcA011984; Sat, 24 Jun 2023 15:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OF3Flx011983; Sat, 24 Jun 2023 15:03:15 GMT (envelope-from git) Date: Sat, 24 Jun 2023 15:03:15 GMT Message-Id: <202306241503.35OF3Flx011983@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 57bf75dc7fbd - main - lang/ghc: Pass CC and CXX to Hadrian to fix build in lang/gcc presence. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57bf75dc7fbd09e9cacfe6f077876b66bca618de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=57bf75dc7fbd09e9cacfe6f077876b66bca618de commit 57bf75dc7fbd09e9cacfe6f077876b66bca618de Author: Gleb Popov AuthorDate: 2023-06-24 14:17:13 +0000 Commit: Gleb Popov 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 , Mark Evenson --- 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: