From 92f301f775835bbbfe981acfd7999d97ed333d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 3 Aug 2018 10:54:50 +0300
Subject: [PATCH] Suppress compiler warnings in libunwind/libcxxabi if llvm
 cmake files are unavailable

The llvm cmake files add a few compiler flags, among them one for
suppressing warnings.
---
 build-libcxx.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/build-libcxx.sh b/build-libcxx.sh
index d4a6b11..71e374d 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -50,6 +50,9 @@ cd libunwind
 for arch in $ARCHS; do
     mkdir -p build-$arch
     cd build-$arch
+    # If llvm-config and the llvm cmake files are available, -w gets added
+    # to the compiler flags; manually add it here to avoid noisy warnings
+    # that normally are suppressed.
     cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \
@@ -68,7 +71,8 @@ for arch in $ARCHS; do
         -DLIBUNWIND_ENABLE_SHARED=FALSE \
         -DLIBUNWIND_ENABLE_CROSS_UNWINDING=FALSE \
         -DLIBUNWIND_STANDALONE_BUILD=TRUE \
-        -DCMAKE_CXX_FLAGS="-nostdinc++ -I$LIBCXX/include" \
+        -DCMAKE_CXX_FLAGS="-nostdinc++ -I$LIBCXX/include -w" \
+        -DCMAKE_C_FLAGS="-w" \
         ..
     make -j$CORES
     make install
@@ -85,6 +89,9 @@ cd libcxxabi
 for arch in $ARCHS; do
     mkdir -p build-$arch
     cd build-$arch
+    # If llvm-config and the llvm cmake files are available, -w gets added
+    # to the compiler flags; manually add it here to avoid noisy warnings
+    # that normally are suppressed.
     cmake \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=$PREFIX/$arch-w64-mingw32 \
@@ -104,7 +111,7 @@ for arch in $ARCHS; do
         -DLIBCXXABI_LIBCXX_INCLUDES=../../libcxx/include \
         -DLLVM_NO_OLD_LIBSTDCXX=TRUE \
         -DCXX_SUPPORTS_CXX11=TRUE \
-        -DCMAKE_CXX_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32" \
+        -DCMAKE_CXX_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCPP_HAS_THREAD_API_WIN32 -w" \
         ..
     make -j$CORES
     cd ..