Page MenuHomeFreeBSD
Files F152445997

D29552.id86749.diff
No OneTemporary
Actions

D29552.id86749.diff
View Options

Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -199,7 +199,7 @@
.if defined(CROSS_TOOLCHAIN_PREFIX)
CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
.endif
-XBINUTILS= AS AR LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN
+XBINUTILS= AS AR ELFCTL LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX) && \
exists(${CROSS_BINUTILS_PREFIX}/${${BINUTIL}})
@@ -794,8 +794,8 @@
CROSSENV+= CC="${XCC} ${XCFLAGS}" CXX="${XCXX} ${XCXXFLAGS} ${XCFLAGS}" \
CPP="${XCPP} ${XCFLAGS}" \
- AS="${XAS}" AR="${XAR}" LD="${XLD}" LLVM_LINK="${XLLVM_LINK}" \
- NM=${XNM} OBJCOPY="${XOBJCOPY}" \
+ AS="${XAS}" AR="${XAR}" ELFCTL="${XELFCTL}" LD="${XLD}" \
+ LLVM_LINK="${XLLVM_LINK}" NM=${XNM} OBJCOPY="${XOBJCOPY}" \
RANLIB=${XRANLIB} STRINGS=${XSTRINGS} \
SIZE="${XSIZE}" STRIPBIN="${XSTRIPBIN}"
@@ -2599,6 +2599,7 @@
.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
_elftctools= lib/libelftc \
lib/libpe \
+ usr.bin/elfctl \
usr.bin/objcopy \
usr.bin/nm \
usr.bin/size \
@@ -2612,6 +2613,7 @@
# the target (for at least crunchide).
_elftctools= lib/libelftc \
lib/libpe \
+ usr.bin/elfctl \
usr.bin/objcopy
.endif
Index: share/mk/sys.mk
===================================================================
--- share/mk/sys.mk
+++ share/mk/sys.mk
@@ -210,6 +210,8 @@
.endif
.endif
+ELFCTL ?= elfctl
+
.if ${.MAKEFLAGS:M-N}
# bmake -N is supposed to skip executing anything but it does not skip
# exeucting '+' commands. The '+' feature is used where .MAKE

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 16, 12:37 AM (8 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31565319
Default Alt Text
D29552.id86749.diff (1 KB)

Event Timeline