From f231314da7b6dd760d78ce403f398d618aa850e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 23 Oct 2020 09:40:40 +0300
Subject: [PATCH] build-libcxx: Remove some hardcoded flags for libcxxabi

These are included properly from libcxx's __config (or __config_site)
now.
---
 build-libcxx.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-libcxx.sh b/build-libcxx.sh
index c15c62e..e0ff2bf 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -187,7 +187,7 @@ build_all() {
         if [ "$type" = "shared" ]; then
             LIBCXXABI_VISIBILITY_FLAGS="-D_LIBCPP_BUILDING_LIBRARY= -U_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS"
         else
-            LIBCXXABI_VISIBILITY_FLAGS="-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS"
+            LIBCXXABI_VISIBILITY_FLAGS=""
         fi
         cmake \
             ${CMAKE_GENERATOR+-G} "$CMAKE_GENERATOR" \
@@ -212,7 +212,7 @@ build_all() {
             -DLIBCXXABI_LIBDIR_SUFFIX="" \
             -DLIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS=OFF \
             -DCXX_SUPPORTS_CXX_STD=TRUE \
-            -DCMAKE_CXX_FLAGS="$LIBCXXABI_VISIBILITY_FLAGS -D_LIBCPP_HAS_THREAD_API_WIN32" \
+            -DCMAKE_CXX_FLAGS="$LIBCXXABI_VISIBILITY_FLAGS" \
             ..
         $BUILDCMD ${CORES+-j$CORES}
         cd ..