Compile 3.9.1 by default, include some more patches

Disable lldb for now, since it doesn't link

Dockerfile

@@ -34,16 +34,23 @@ RUN mkdir /build/build.1 \
     && /tmp/cmake/bin/cmake -G Ninja \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=${PREFIX} \
+            -DCMAKE_C_FLAGS="-I${PREFIX}/include" \
+            -DCMAKE_CXX_FLAGS="-I${PREFIX}/include" \
             -DCLANG_DEFAULT_CXX_STDLIB="libc++" \
-            # -DCLANG_DEFAULT_LINKER="lld" \
-            # -DCLANG_DEFAULT_RTLIB="compiler-rt" \
-            # -DLIBCXX_CXX_ABI="libcxxabi" \
-            # -DLIBCXX_CXX_ABI_INCLUDE_PATHS="/build/src/llvm/projects/libcxxabi/include/" \
-            # -DLIBCXXABI_USE_LLVM_UNWINDER=on \
-            # -DLLVM_ENABLE_ASSERTIONS=off \
+            -DCLANG_DEFAULT_LINKER="lld" \
+            -DCLANG_DEFAULT_RTLIB="compiler-rt" \
+            -DLIBCXX_CXX_ABI="libcxxabi" \
+            -DLIBCXX_CXX_ABI_INCLUDE_PATHS="/build/src/llvm/projects/libcxxabi/include/" \
+            -DLIBCXX_CXX_ABI_LIBRARY_PATH="${PREFIX}/lib" \
+            -DLIBCXXABI_USE_LLVM_UNWINDER=on \
+            -DLIBUNWIND_ENABLE_SHARED=0 \
+            -DLLVM_ENABLE_ASSERTIONS=off \
+            -DLIBCXX_HAS_GCC_S_LIB=0 \
             /build/src/llvm
 
 RUN cd /build/build.1 \
+    && ninja-build cxxabi \
+    && ninja-build install-libcxxabi \
     && ninja-build
 
 RUN cd /build/build.1 \
@@ -51,7 +58,10 @@ RUN cd /build/build.1 \
     && cd /build \
     && rm -rf /build/build.1
 
-RUN tar xJv --strip-components=1 -C /build/src/llvm/projects/lldb        -f /build/downloads/lldb.src.tar.xz
+# RUN tar xJv --strip-components=1 -C /build/src/llvm/projects/lldb        -f /build/downloads/lldb.src.tar.xz
+
+# TODO: move this into the build above
+RUN sed -i 's/-lc++abi/& -lunwind/' $PREFIX/lib/libc++.so
 
 RUN mkdir /build/build.2 \
     && cd /build/build.2 \
@@ -59,10 +69,7 @@ RUN mkdir /build/build.2 \
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INSTALL_PREFIX=${PREFIX} \
             -DCMAKE_C_COMPILER=${PREFIX}/bin/clang \
-            # -DCMAKE_C_FLAGS="-I${PREFIX}/include" \
             -DCMAKE_CXX_COMPILER=${PREFIX}/bin/clang++ \
-            # -DCMAKE_CXX_FLAGS="-I${PREFIX}/include -stdlib=libc++" \
-            # -DCMAKE_CXX_LINK_FLAGS="-lc++abi" \
             -DCMAKE_C_FLAGS="-I${PREFIX}/include" \
             -DCMAKE_CXX_FLAGS="-I${PREFIX}/include" \
             -DCLANG_DEFAULT_CXX_STDLIB="libc++" \
@@ -70,15 +77,20 @@ RUN mkdir /build/build.2 \
             -DCLANG_DEFAULT_RTLIB="compiler-rt" \
             -DLIBCXX_CXX_ABI="libcxxabi" \
             -DLIBCXX_CXX_ABI_INCLUDE_PATHS="/build/src/llvm/projects/libcxxabi/include/" \
+            -DLIBCXXABI_USE_COMPILER_RT=on \
             -DLIBCXXABI_USE_LLVM_UNWINDER=on \
+            -DLIBUNWIND_ENABLE_SHARED=0 \
+            -DLIBCXX_HAS_GCC_S_LIB=0 \
             -DLLVM_ENABLE_ASSERTIONS=off \
             /build/src/llvm
 
 RUN cd /build/build.2 \
+    && ninja-build cxxabi cxx \
+    && sed -i 's/-lc++abi/& -lunwind/' lib/libc++.so \
     && ninja-build
 
 RUN cd /build/build.2 \
-    && sed -i '/INSTALL DESTINATION/ s/.*lib\>/&64/' projects/lldb/scripts/cmake_install.cmake \
+    # && sed -i '/INSTALL DESTINATION/ s/.*lib\>/&64/' projects/lldb/scripts/cmake_install.cmake \
     && ninja-build install \
     && cd /build \
     && rm -rf /build/build.2