From 61f3130a42207063538621ea9812bd4b50937c1a Mon Sep 17 00:00:00 2001
From: JJ Roberts-White <computerfido@gmail.com>
Date: Thu, 27 Jan 2022 13:19:29 +1100
Subject: [PATCH] Slimmer LLVM build

---
 .github/workflows/ci.yml    | 2 +-
 Scripts/lemon-crossfile.txt | 2 +-
 bootstrap.yml               | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0fd62b49..c49f9ed6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -86,7 +86,7 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y build-essential autoconf python3 python3-pip ninja-build qemu-utils nasm
-          sudo python3 -m pip install meson
+          sudo python3 -m pip install meson xbstrap
 
       - name: Initialize and Update submodules
         run: git submodule update --init
diff --git a/Scripts/lemon-crossfile.txt b/Scripts/lemon-crossfile.txt
index b5d564dd..53c8efeb 100755
--- a/Scripts/lemon-crossfile.txt
+++ b/Scripts/lemon-crossfile.txt
@@ -1,7 +1,7 @@
 [binaries]
 c = 'clang'
 cpp = 'clang++'
-strip = '86_64-lemon-strip'
+strip = 'x86_64-lemon-strip'
 ld = 'x86_64-lemon-ld'
 pkgconfig = 'pkg-config'
 
diff --git a/bootstrap.yml b/bootstrap.yml
index 25e6d825..cd086ff3 100644
--- a/bootstrap.yml
+++ b/bootstrap.yml
@@ -132,6 +132,10 @@ tools:
         - '-DCMAKE_INSTALL_PREFIX=@PREFIX@'
         - '-DDEFAULT_SYSROOT=@SYSROOT_DIR@'
         - '-DLLVM_PARALLEL_LINK_JOBS=@OPTION:llvm_linkcount@'
+        - '-DCLANG_BUILD_TOOLS=OFF'
+        - '-DCLANG_ENABLE_ARCMT=OFF'
+        - '-DCLANG_ENABLE_STATIC_ANALYZER=OFF'
+        - '-DLLVM_INCLUDE_TESTS=OFF'
         - '-C@THIS_SOURCE_DIR@/clang/cmake/caches/Lemon.cmake'
     stages:
       - name: compiler