Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Nov 2021 08:54:03 GMT
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dfd3f7e23b6a - main - sysutils/edk2: Remove aarch64-none-elf-gcc on aarch64
Message-ID:  <202111090854.1A98s36f067674@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by manu:

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

commit dfd3f7e23b6a08182b5aebc142685ae8df10485a
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-09-29 10:22:29 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2021-11-09 08:53:49 +0000

    sysutils/edk2: Remove aarch64-none-elf-gcc on aarch64
    
    We can use the native gcc (from USE_GCC) to build the ports so don't
    add another build dep.
---
 sysutils/edk2/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
index 503ff8fe42f7..65152f193e29 100644
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -104,7 +104,9 @@ MAKE_ENV+=	WORKSPACE=${WRKDIR} \
 		PYTHON_COMMAND=python3 \
 		PYTHONHASHSEED=1
 
-.if ${PLAT_ARCH} == AARCH64
+.include <bsd.port.pre.mk>
+
+.if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64
 BUILD_DEPENDS+=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 MAKE_ENV+=	GCC5_AARCH64_PREFIX=aarch64-none-elf-
 .endif
@@ -131,4 +133,4 @@ do-install:
 	${MKDIR} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/
 	${INSTALL_DATA} ${WRKDIR}/Build/${PLAT_RESULT} ${STAGEDIR}/${PREFIX}/share/${PORTNAME}-${PLAT}/${PLAT_FILENAME}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111090854.1A98s36f067674>