diff options
| author | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2022-07-13 10:20:19 +0000 |
|---|---|---|
| committer | Jeremie Courreges-Anglas <jca@cvs.openbsd.org> | 2022-07-13 10:20:19 +0000 |
| commit | ca00d8c6b47738081dbf9f6fe986b10cece5147e (patch) | |
| tree | 2cb3c1c82132d141349c110f59444f687bdac482 /gnu/usr.bin | |
| parent | 89199d0cee75871e125f2f65db06207b4534bb33 (diff) | |
Revert BUILD_LLDB use, don't push manual repair on all people building from source
Pointed out by sthen@
While make build indeed takes care of running make install in share/mk,
running make obj first would error out when encountering the unknown
BUILD_LLDB variable. I can wait a few days before committing this again.
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/clang/Makefile | 6 | ||||
| -rw-r--r-- | gnu/usr.bin/clang/lldb-server/Makefile | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/clang/lldb/Makefile | 7 |
3 files changed, 14 insertions, 6 deletions
diff --git a/gnu/usr.bin/clang/Makefile b/gnu/usr.bin/clang/Makefile index 71f16db67ee..0be074f94b0 100644 --- a/gnu/usr.bin/clang/Makefile +++ b/gnu/usr.bin/clang/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2022/07/12 21:10:26 jca Exp $ +# $OpenBSD: Makefile,v 1.23 2022/07/13 10:20:18 jca Exp $ .include <bsd.own.mk> @@ -51,7 +51,6 @@ SUBDIR+=liblldELF SUBDIR+=lld -.if ${BUILD_LLDB:L} == "yes" || make(obj) SUBDIR+=lldb-tblgen SUBDIR+=include/lldb/Commands SUBDIR+=include/lldb/Core @@ -98,7 +97,6 @@ SUBDIR+=liblldbUtility SUBDIR+=lldb SUBDIR+=lldb-server -.endif SUBDIR+=include/llvm-objcopy SUBDIR+=llvm-objcopy @@ -109,7 +107,7 @@ SUBDIR+=llvm-readobj SUBDIR+=llvm-profdata -.if ${AR_VERSION:L} == "llvm" || make(obj) +.if ${AR_VERSION:L} == "llvm" SUBDIR+=libLLVMDlltoolDriver SUBDIR+=libLLVMLibDriver SUBDIR+=llvm-ar diff --git a/gnu/usr.bin/clang/lldb-server/Makefile b/gnu/usr.bin/clang/lldb-server/Makefile index 6fc8fe7539c..c1730808141 100644 --- a/gnu/usr.bin/clang/lldb-server/Makefile +++ b/gnu/usr.bin/clang/lldb-server/Makefile @@ -1,8 +1,13 @@ -# $OpenBSD: Makefile,v 1.7 2022/07/12 21:06:04 jca Exp $ +# $OpenBSD: Makefile,v 1.8 2022/07/13 10:20:18 jca Exp $ .include <bsd.own.mk> +.if (${MACHINE} == "arm64") || (${MACHINE} == "amd64") PROG= lldb-server +.else +NOPROG= lldb-server +.endif + BINDIR= /usr/bin NOMAN= diff --git a/gnu/usr.bin/clang/lldb/Makefile b/gnu/usr.bin/clang/lldb/Makefile index c635a3b4738..d460b5da92b 100644 --- a/gnu/usr.bin/clang/lldb/Makefile +++ b/gnu/usr.bin/clang/lldb/Makefile @@ -1,8 +1,13 @@ -# $OpenBSD: Makefile,v 1.12 2022/07/12 21:06:04 jca Exp $ +# $OpenBSD: Makefile,v 1.13 2022/07/13 10:20:18 jca Exp $ .include <bsd.own.mk> +.if (${MACHINE} == "arm64") || (${MACHINE} == "amd64") PROG= lldb +.else +NOPROG= lldb +.endif + BINDIR= /usr/bin LIBEXECDIR=/usr/libexec |