Skip to content

Commit fdc4db5

Browse files
committed
usr.bin/Makefile: always build ELF Tool Chain strings(1)
strings(1) is not conditional on WITH_/WITHOUT_TOOLCHAIN, as it is a small utility that is also useful outside of the toolchain context. As of commit 1cae712 we switched to WITH_LLVM_BINUTILS by default. After this change building world with default options but installing WITHOUT_TOOLCHAIN failed, because we would build LLVM's strings but attempt to install ELF Tool Chain's version, which did not exist. Address this by always including ELF Tool Chain strings in non-install make targets, so that it will be available if options are changed at install time. PR: 285556 Reported by: Michael Butler Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49425
1 parent 5682eee commit fdc4db5

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

usr.bin/Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@ SUBDIR.${MK_TOOLCHAIN}+= nm
250250
SUBDIR.${MK_TOOLCHAIN}+= objcopy
251251
SUBDIR.${MK_TOOLCHAIN}+= readelf
252252
SUBDIR.${MK_TOOLCHAIN}+= size
253+
.endif
254+
# Include elftoolchain's strings in build targets even if using LLVM_BINUTILS,
255+
# as we may later install with different options. In particular, the release
256+
# artifact builds use default options for buildworld but install with
257+
# MK_TOOLCHAIN=no which implies MK_LLVM_BINUTILS=no.
258+
.if ${MK_LLVM_BINUTILS} == "no" || !make(install)
253259
SUBDIR+= strings
254260
.endif
255261
SUBDIR.${MK_TOOLCHAIN}+= c89

0 commit comments

Comments
 (0)