From 82777fcb1f27259c1b312d0f0f7b07994a6c3803 Mon Sep 17 00:00:00 2001
From: jca <jca@openbsd.org>
Date: Tue, 12 Jul 2022 21:06:04 +0000
Subject: [PATCH] Only build lldb support libraries on archs where lldb is
 installed

Shaves off a significant amount of time (eg on riscv64) in base builds.

Note that you'll need bsd.own.mk rev 1.213 (which make build should take
care of).

ok miod@ patrick@
---
 gnu/usr.bin/clang/Makefile             | 4 +++-
 gnu/usr.bin/clang/lldb-server/Makefile | 7 +------
 gnu/usr.bin/clang/lldb/Makefile        | 7 +------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/gnu/usr.bin/clang/Makefile b/gnu/usr.bin/clang/Makefile
index b0da444ca9b..a97b812e39f 100644
--- a/gnu/usr.bin/clang/Makefile
+++ b/gnu/usr.bin/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2022/07/11 14:43:24 robert Exp $
+# $OpenBSD: Makefile,v 1.21 2022/07/12 21:06:04 jca Exp $
 
 .include <bsd.own.mk>
 
@@ -51,6 +51,7 @@ SUBDIR+=liblldELF
 SUBDIR+=lld
 
 
+.if ${BUILD_LLDB:L} == "yes"
 SUBDIR+=lldb-tblgen
 SUBDIR+=include/lldb/Commands
 SUBDIR+=include/lldb/Core
@@ -97,6 +98,7 @@ SUBDIR+=liblldbUtility
 
 SUBDIR+=lldb
 SUBDIR+=lldb-server
+.endif
 
 SUBDIR+=include/llvm-objcopy
 SUBDIR+=llvm-objcopy
diff --git a/gnu/usr.bin/clang/lldb-server/Makefile b/gnu/usr.bin/clang/lldb-server/Makefile
index f55f44e489c..6fc8fe7539c 100644
--- a/gnu/usr.bin/clang/lldb-server/Makefile
+++ b/gnu/usr.bin/clang/lldb-server/Makefile
@@ -1,13 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2021/12/17 14:55:47 patrick Exp $
+# $OpenBSD: Makefile,v 1.7 2022/07/12 21:06:04 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 3ab9247c4a1..c635a3b4738 100644
--- a/gnu/usr.bin/clang/lldb/Makefile
+++ b/gnu/usr.bin/clang/lldb/Makefile
@@ -1,13 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2021/12/17 14:55:47 patrick Exp $
+# $OpenBSD: Makefile,v 1.12 2022/07/12 21:06:04 jca Exp $
 
 .include <bsd.own.mk>
 
-.if (${MACHINE} == "arm64") || (${MACHINE} == "amd64")
 PROG=	lldb
-.else
-NOPROG=	lldb
-.endif
-
 BINDIR=	/usr/bin
 LIBEXECDIR=/usr/libexec
 
-- 
2.20.1