From 2dd95c82fdd7b9a227360e7273106d081be215ad Mon Sep 17 00:00:00 2001
From: jca <jca@openbsd.org>
Date: Tue, 26 Jul 2022 15:34:33 +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.

If you want to build gnu/usr.bin/clang from source you'll need
bsd.own.mk rev 1.213 installed.

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 0be074f94b0..013547a6899 100644
--- a/gnu/usr.bin/clang/Makefile
+++ b/gnu/usr.bin/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2022/07/13 10:20:18 jca Exp $
+# $OpenBSD: Makefile,v 1.24 2022/07/26 15:34:33 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 c1730808141..115bfe2a5cd 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.8 2022/07/13 10:20:18 jca Exp $
+# $OpenBSD: Makefile,v 1.9 2022/07/26 15:34:33 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 d460b5da92b..4ae6f5a4585 100644
--- a/gnu/usr.bin/clang/lldb/Makefile
+++ b/gnu/usr.bin/clang/lldb/Makefile
@@ -1,13 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2022/07/13 10:20:18 jca Exp $
+# $OpenBSD: Makefile,v 1.14 2022/07/26 15:34:33 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