diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2023-01-27 22:01:03 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2023-01-27 22:01:03 +0000 |
| commit | 97163f07ffb31729c3f71922c7cca43e5b3b0c20 (patch) | |
| tree | ab5caf878374af60042ab8f8069423e64bbae2d1 /gnu | |
| parent | 12697494bde11c873bd0bf63f464bf2478706f87 (diff) | |
Recommit the switch to use llvm-strip on architectures that use ld.lld.
ok naddy@, sthen@
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper | 10 | ||||
| -rw-r--r-- | gnu/usr.bin/clang/llvm-objcopy/Makefile | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper index 9c2333c13dc..b2150cb063c 100644 --- a/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper +++ b/gnu/usr.bin/binutils-2.17/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.30 2023/01/19 22:54:45 kettenis Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.31 2023/01/27 22:01:02 kettenis Exp $ .include <bsd.own.mk> @@ -29,7 +29,7 @@ MAN= binutils/doc/addr2line.1 binutils/doc/objcopy.1 \ SUBDIRS+= binutils CONF_SUBDIRS+= binutils INST_SUBDIRS+= binutils -MAN+= binutils/doc/strings.1 binutils/doc/strip.1 +MAN+= binutils/doc/strings.1 .if (${TARGET_ARCH} != "aarch64" && ${TARGET_ARCH} != "powerpc64" && \ ${TARGET_ARCH} != "riscv64") @@ -47,8 +47,12 @@ SKIP_AR= am__EXEEXT_7= am__EXEEXT_9= .endif .if ${LINKER_VERSION:L} == "bfd" +MAN+= binutils/doc/strip.1 maninstall: cd ${DESTDIR}${MANDIR}1 && rm -f ld.1 && ln ld.bfd.1 ld.1 +.else +# skip installing strip(1) which is am__EXEEXT_14 +SKIP_STRIP= am__EXEEXT_14= .endif # Used by the GNU Makefile @@ -139,7 +143,7 @@ install: maninstall INSTALL_PROGRAM='${INSTALL} -c ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}' \ INSTALL_DATA='${INSTALL} -c -o ${DOCOWN} -g ${DOCGRP} -m ${NONBINMODE}' \ INSTALL_INFO_HOST_MODULES='${INSTALL_INFO_HOST_MODULES}' \ - ${SKIP_AR} \ + ${SKIP_AR} ${SKIP_STRIP} \ $t .endfor .if ${LINKER_VERSION:L} == "bfd" diff --git a/gnu/usr.bin/clang/llvm-objcopy/Makefile b/gnu/usr.bin/clang/llvm-objcopy/Makefile index 36d39cfe974..6f3fd0fa134 100644 --- a/gnu/usr.bin/clang/llvm-objcopy/Makefile +++ b/gnu/usr.bin/clang/llvm-objcopy/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2023/01/19 22:54:45 kettenis Exp $ +# $OpenBSD: Makefile,v 1.5 2023/01/27 22:01:02 kettenis Exp $ .include <bsd.own.mk> PROG= llvm-objcopy +MAN= llvm-objcopy.1 BINDIR= /usr/bin LIBEXECDIR=/usr/libexec @@ -24,6 +25,11 @@ SRCS= ConfigManager.cpp \ WasmWriter.cpp \ WasmObjcopy.cpp +.if ${LINKER_VERSION:L} == "lld" +LINKS= ${BINDIR}/llvm-objcopy ${BINDIR}/strip +MAN+= strip.1 +.endif + COFFObject.cpp: ln -s ${.CURDIR}/../../../llvm/llvm/tools/llvm-objcopy/COFF/Object.cpp $@ |