Page MenuHomeFreeBSD
Files F137947423

D5613.id14286.diff
No OneTemporary
Actions

D5613.id14286.diff
View Options

Index: head/sys/boot/efi/boot1/Makefile
===================================================================
--- head/sys/boot/efi/boot1/Makefile
+++ head/sys/boot/efi/boot1/Makefile
@@ -73,8 +73,8 @@
DPADD+= ${LDSCRIPT}
+NM?= nm
OBJCOPY?= objcopy
-OBJDUMP?= objdump
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
@@ -85,8 +85,8 @@
.endif
boot1.efi: ${PROG}
- if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
- ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+ if ${NM} ${.ALLSRC} | grep ' U '; then \
+ echo "Undefined symbols in ${.ALLSRC}"; \
exit 1; \
fi
${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \
Index: head/sys/boot/efi/loader/Makefile
===================================================================
--- head/sys/boot/efi/loader/Makefile
+++ head/sys/boot/efi/loader/Makefile
@@ -98,8 +98,8 @@
vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../efi/loader/version
sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT}
+NM?= nm
OBJCOPY?= objcopy
-OBJDUMP?= objdump
.if ${MACHINE_CPUARCH} == "amd64"
EFI_TARGET= efi-app-x86_64
@@ -110,8 +110,8 @@
.endif
loader.efi: ${PROG}
- if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
- ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \
+ if ${NM} ${.ALLSRC} | grep ' U '; then \
+ echo "Undefined symbols in ${.ALLSRC}"; \
exit 1; \
fi
${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 1:56 PM (16 h, 38 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26285553
Default Alt Text
D5613.id14286.diff (1 KB)

Event Timeline