Page MenuHomeFreeBSD
Files F159189501

D57357.id178979.diff
No OneTemporary
Actions

D57357.id178979.diff
View Options

diff --git a/sysutils/edk2/Makefile b/sysutils/edk2/Makefile
--- a/sysutils/edk2/Makefile
+++ b/sysutils/edk2/Makefile
@@ -19,7 +19,6 @@
USES= dos2unix cpe gmake python:build
CPE_VENDOR= tianocore
-USE_GCC= yes:build
DOS2UNIX_FILES= UefiCpuPkg/CpuDxe/CpuDxe.inf \
UefiCpuPkg/CpuDxe/CpuDxe.c \
UefiCpuPkg/CpuDxe/CpuPageTable.c \
@@ -51,23 +50,10 @@
.include <bsd.port.pre.mk>
-# Heavily dependent on bsd.port.pre.mk definitions for lang/gcc* details:
BINARY_ALIAS= make=${GMAKE} \
- ar=${AR} \
dtc=${LOCALBASE}/bin/dtc \
- gcc=${LOCALBASE}/bin/${CC} \
- g++=${LOCALBASE}/bin/${CXX} \
- gcc-nm=${LOCALBASE}/bin/${CC:S/gcc/&-nm/} \
- gcc-ar=${LOCALBASE}/bin/${CC:S/gcc/&-ar/} \
- gcc-ranlib=${LOCALBASE}/bin/${CC:S/gcc/&-ranlib/} \
python3=${PYTHON_CMD} python=${PYTHON_CMD}
-# Avoid: "ld-elf.so.1: /lib/libgcc_s.so.1: version GCC_4.5.0
-# required by /usr/local/lib/gcc11/libstdc++.so.6 not found"
-# (that is from /lib/libgcc_s.so.1 having incomplete/inaccurate
-# coverage for aarch64 g++ code generation's use of libgcc_s.so.1 ):
-EXTRA_LDFLAGS+= -Wl,-rpath=${_GCC_RUNTIME}
-
# Global args
PLAT_ARGS= -D NETWORK_IP6_ENABLE
@@ -77,7 +63,7 @@
PLAT_ARGS+= -D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
PLAT_TARGET= RELEASE
PLATFILE= Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
-PLAT_RESULT= ArmVExpress-FVP-AArch64/${PLAT_TARGET}_GCC/FV/FVP_AARCH64_EFI.fd
+PLAT_RESULT= ArmVExpress-FVP-AArch64/${PLAT_TARGET}_CLANGDWARF/FV/FVP_AARCH64_EFI.fd
PLAT_FILENAME= FVP_AARCH64_EFI.fd
.endif
@@ -87,7 +73,7 @@
PLAT_ARGS+= -D X64EMU_ENABLE=TRUE -D CAPSULE_ENABLE=FALSE
PLAT_TARGET= RELEASE
PLATFILE= Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc
-PLAT_RESULT= Armada80x0McBin-AARCH64/${PLAT_TARGET}_GCC/FV/ARMADA_EFI.fd
+PLAT_RESULT= Armada80x0McBin-AARCH64/${PLAT_TARGET}_CLANGDWARF/FV/ARMADA_EFI.fd
PLAT_FILENAME= ARMADA_EFI.fd
.endif
@@ -97,7 +83,7 @@
PLAT_ARGS+= -D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
PLAT_TARGET= RELEASE
PLATFILE= Platform/RaspberryPi/RPi3/RPi3.dsc
-PLAT_RESULT= RPi3/${PLAT_TARGET}_GCC/FV/RPI_EFI.fd
+PLAT_RESULT= RPi3/${PLAT_TARGET}_CLANGDWARF/FV/RPI_EFI.fd
PLAT_FILENAME= RPI_EFI.fd
.endif
@@ -107,7 +93,7 @@
PLAT_ARGS+= -D X64EMU_ENABLE=FALSE -D CAPSULE_ENABLE=FALSE
PLAT_TARGET= RELEASE
PLATFILE= Platform/RaspberryPi/RPi4/RPi4.dsc
-PLAT_RESULT= RPi4/${PLAT_TARGET}_GCC/FV/RPI_EFI.fd
+PLAT_RESULT= RPi4/${PLAT_TARGET}_CLANGDWARF/FV/RPI_EFI.fd
PLAT_FILENAME= RPI_EFI.fd
.endif
@@ -118,7 +104,7 @@
PLAT_ARCH= X64
PLAT_TARGET= RELEASE
PLATFILE= OvmfPkg/OvmfXen.dsc
-PLAT_RESULT= OvmfXen/${PLAT_TARGET}_GCC/FV/OVMF.fd
+PLAT_RESULT= OvmfXen/${PLAT_TARGET}_CLANGDWARF/FV/OVMF.fd
PLAT_FILENAME= XEN_X64_EFI.fd
.endif
@@ -130,9 +116,9 @@
PLAT_ARGS+= -D SECURE_BOOT_ENABLE=TRUE -D TPM2_ENABLE=TRUE
PLAT_TARGET= RELEASE
PLATFILE= OvmfPkg/Bhyve/BhyveX64.dsc
-PLAT_RESULT= BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE.fd
-PLAT_RESULT_CODE= BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE_CODE.fd
-PLAT_RESULT_VARS= BhyveX64/${PLAT_TARGET}_GCC/FV/BHYVE_VARS.fd
+PLAT_RESULT= BhyveX64/${PLAT_TARGET}_CLANGDWARF/FV/BHYVE.fd
+PLAT_RESULT_CODE= BhyveX64/${PLAT_TARGET}_CLANGDWARF/FV/BHYVE_CODE.fd
+PLAT_RESULT_VARS= BhyveX64/${PLAT_TARGET}_CLANGDWARF/FV/BHYVE_VARS.fd
PLAT_FILENAME= BHYVE_UEFI.fd
PLAT_FILENAME_CODE= BHYVE_UEFI_CODE.fd
PLAT_FILENAME_VARS= BHYVE_UEFI_VARS.fd
@@ -145,9 +131,9 @@
PLAT_ARCH= X64
PLAT_TARGET= RELEASE
PLATFILE= OvmfPkg/OvmfPkgX64.dsc
-PLAT_RESULT= OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF.fd
-PLAT_RESULT_CODE= OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF_CODE.fd
-PLAT_RESULT_VARS= OvmfX64/${PLAT_TARGET}_GCC/FV/OVMF_VARS.fd
+PLAT_RESULT= OvmfX64/${PLAT_TARGET}_CLANGDWARF/FV/OVMF.fd
+PLAT_RESULT_CODE= OvmfX64/${PLAT_TARGET}_CLANGDWARF/FV/OVMF_CODE.fd
+PLAT_RESULT_VARS= OvmfX64/${PLAT_TARGET}_CLANGDWARF/FV/OVMF_VARS.fd
PLAT_FILENAME= QEMU_UEFI-x86_64.fd
PLAT_FILENAME_CODE= QEMU_UEFI_CODE-x86_64.fd
PLAT_FILENAME_VARS= QEMU_UEFI_VARS-x86_64.fd
@@ -160,9 +146,9 @@
PLAT_ARCH= IA32
PLAT_TARGET= RELEASE
PLATFILE= OvmfPkg/OvmfPkgIa32.dsc
-PLAT_RESULT= OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF.fd
-PLAT_RESULT_CODE= OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF_CODE.fd
-PLAT_RESULT_VARS= OvmfIa32/${PLAT_TARGET}_GCC/FV/OVMF_VARS.fd
+PLAT_RESULT= OvmfIa32/${PLAT_TARGET}_CLANGDWARF/FV/OVMF.fd
+PLAT_RESULT_CODE= OvmfIa32/${PLAT_TARGET}_CLANGDWARF/FV/OVMF_CODE.fd
+PLAT_RESULT_VARS= OvmfIa32/${PLAT_TARGET}_CLANGDWARF/FV/OVMF_VARS.fd
PLAT_FILENAME= QEMU_UEFI-i386.fd
PLAT_FILENAME_CODE= QEMU_UEFI_CODE-i386.fd
PLAT_FILENAME_VARS= QEMU_UEFI_VARS-i386.fd
@@ -181,11 +167,6 @@
PLIST_FILES+= ${PREFIX}/share/uefi-firmware/${PLAT_FILENAME_VARS}
.endif
-.if ${PLAT_ARCH} == AARCH64 && ${ARCH} != aarch64
-BUILD_DEPENDS+= aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
-MAKE_ENV+= GCC_AARCH64_PREFIX=aarch64-none-elf-
-.endif
-
.if ${PLAT_ARCH} == X64 || ${PLAT_ARCH} == IA32
BUILD_DEPENDS+= nasm:devel/nasm
.endif
@@ -217,7 +198,7 @@
cd ${WRKDIR}/edk2-${GH_TAGNAME} && \
${MAKE_CMD} -C BaseTools -j ${MAKE_JOBS_NUMBER} && \
source edksetup.sh && \
- build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t GCC -b ${PLAT_TARGET} ${PLAT_ARGS} \
+ build -a ${PLAT_ARCH} -p ${PLATFILE} -n ${MAKE_JOBS_NUMBER} -t CLANGDWARF -b ${PLAT_TARGET} ${PLAT_ARGS} \
')
do-install:

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 12, 3:00 AM (8 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33648533
Default Alt Text
D57357.id178979.diff (5 KB)

Event Timeline