zefie/llvm-mingw
1
0 Fork 0
Code Activity

Only use the newer form for disabling LLDB's external dependencies

Browse Source 
Also pass the new form properly when cross compiling LLDB.
This commit is contained in:
Martin Storsjö committed 2020-03-25 00:19:49 +02:00
1 parent efec56e495
commit 91c1339222
1 file changed
+1 -4
Download Patch File Download Diff File Expand all files Collapse all files
build-llvm.sh
+1 -4
View File
@@ -103,7 +103,7 @@ if [ -n "$HOST" ]; then
CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_C_COMPILER=$HOST-gcc" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_C_COMPILER=$HOST-gcc"
CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CXX_COMPILER=$HOST-g++" CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_CXX_COMPILER=$HOST-g++"
CMAKEFLAGS="$CMAKEFLAGS -DCMAKE_RC_COMPILER=$HOST-windres" 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) native=$(find_native_tools)
if [ -n "$native" ]; then if [ -n "$native" ]; then
@@ -171,9 +171,6 @@ cmake \
-DLLVM_INSTALL_TOOLCHAIN_ONLY=$TOOLCHAIN_ONLY \ -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" \ -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} \ ${HOST+-DLLVM_HOST_TRIPLE=$HOST} \
-DLLDB_DISABLE_LIBEDIT=ON \
-DLLDB_DISABLE_PYTHON=ON \
-DLLDB_DISABLE_CURSES=ON \
-DLLDB_ENABLE_LIBEDIT=OFF \ -DLLDB_ENABLE_LIBEDIT=OFF \
-DLLDB_ENABLE_PYTHON=OFF \ -DLLDB_ENABLE_PYTHON=OFF \
-DLLDB_ENABLE_CURSES=OFF \ -DLLDB_ENABLE_CURSES=OFF \