From 91c1339222b4cad4f24c1ae6dd69ec415e86c936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 5 Feb 2020 09:53:58 +0000
Subject: [PATCH] Only use the newer form for disabling LLDB's external
 dependencies

Also pass the new form properly when cross compiling LLDB.
---
 build-llvm.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build-llvm.sh b/build-llvm.sh
index 4a0b9d2..d2e21ed 100755
--- a/build-llvm.sh
+++ b/build-llvm.sh
@@ -103,7 +103,7 @@ if [ -n "$HOST" ]; then
     CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_C_COMPILER=$HOST-gcc"
     CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CXX_COMPILER=$HOST-g++"
     CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_RC_COMPILER=$HOST-windres"
-    CMAKEFLAGS="$CMAKEFLAGS -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DLLDB_DISABLE_LIBEDIT=ON;-DLLDB_DISABLE_PYTHON=ON;-DLLDB_DISABLE_CURSES=ON"
+    CMAKEFLAGS="$CMAKEFLAGS -DCROSS_TOOLCHAIN_FLAGS_NATIVE=-DLLDB_ENABLE_LIBEDIT=OFF;-DLLDB_ENABLE_PYTHOFF=OFF;-DLLDB_ENABLE_CURSES=OFF;-DLLDB_ENABLE_LUA=OFF"
 
     native=$(find_native_tools)
     if [ -n "$native" ]; then
@@ -171,9 +171,6 @@ cmake \
     -DLLVM_INSTALL_TOOLCHAIN_ONLY=$TOOLCHAIN_ONLY \
     -DLLVM_TOOLCHAIN_TOOLS="llvm-ar;llvm-ranlib;llvm-objdump;llvm-rc;llvm-cvtres;llvm-nm;llvm-strings;llvm-readobj;llvm-dlltool;llvm-pdbutil;llvm-objcopy;llvm-strip;llvm-cov;llvm-profdata;llvm-addr2line;llvm-symbolizer" \
     ${HOST+-DLLVM_HOST_TRIPLE=$HOST} \
-    -DLLDB_DISABLE_LIBEDIT=ON \
-    -DLLDB_DISABLE_PYTHON=ON \
-    -DLLDB_DISABLE_CURSES=ON \
     -DLLDB_ENABLE_LIBEDIT=OFF \
     -DLLDB_ENABLE_PYTHON=OFF \
     -DLLDB_ENABLE_CURSES=OFF \