Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F115912177
D49722.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
841 B
Referenced Files
None
Subscribers
None
D49722.diff
View Options
diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc
--- a/stand/efi/Makefile.inc
+++ b/stand/efi/Makefile.inc
@@ -1,3 +1,5 @@
+.include <src.opts.mk>
+
# Options used when building app-specific efi components
# See conf/kern.mk for the correct set of these
CFLAGS+= -Wformat
@@ -26,7 +28,20 @@
.else
EFI_TARGET= binary
.endif
+
+# GNU or ELF Tool Chain objcopy is usable for building EFI objects.
+# LLVM objcopy is not. Use elfcopy if we've bootstrapped it (and thus
+# known to be available) or objcopy is LLVM's.
+.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
EFI_OBJCOPY?= elfcopy
+.else
+_v!= ${OBJCOPY} --version
+.if ${_v:Mllvm-objcopy*} == ""
+EFI_OBJCOPY?= ${OBJCOPY}
+.else
+EFI_OBJCOPY?= elfcopy
+.endif
+.endif
# Arbitrarily set the PE/COFF header timestamps to 1 Jan 2024 00:00:00
# for build reproducibility.
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, May 1, 8:05 AM (19 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17461769
Default Alt Text
D49722.diff (841 B)
Attached To
Mode
D49722: boot: Only use elfcopy if in-tree toolchain was built
Attached
Detach File
Event Timeline
Log In to Comment