From b224e2c290fa9bf4e486a51c47165bff2f1503b8 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sat, 24 Apr 2021 08:17:18 +0800 Subject: [PATCH] libc++abi: Fix header path Temporary fix until upstream catches up. --- src/buildtools/third_party/libc++abi/BUILD.gn | 2 +- .../third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/buildtools/third_party/libc++abi/BUILD.gn b/src/buildtools/third_party/libc++abi/BUILD.gn index 78c413535f..26c5875524 100644 --- a/src/buildtools/third_party/libc++abi/BUILD.gn +++ b/src/buildtools/third_party/libc++abi/BUILD.gn @@ -91,7 +91,7 @@ source_set("libc++abi") { # TODO(thakis): This is a gross workaround for https:/llvm.org/PR49313 # We had to copy refstring.h into libc++abi for the relative path to work, # but the copy includes more stuff from libc++'s internal headers. - include_dirs = [ "../libc++/trunk/src/include" ] + include_dirs = [ "../libc++/trunk" ] if (!is_mac) { sources -= [ "trunk/src/cxa_exception.cpp", diff --git a/src/buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp b/src/buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp index 4a464e4889..0f5efe491b 100644 --- a/src/buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp +++ b/src/buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp @@ -6,7 +6,6 @@ // //===----------------------------------------------------------------------===// -#include "../../libcxx/src/include/refstring.h" #include "stdexcept" #include "new" #include @@ -14,6 +13,9 @@ #include #include +// This includes an implementation file from libc++. +#include "src/include/refstring.h" + static_assert(sizeof(std::__libcpp_refstring) == sizeof(const char *), ""); namespace std // purposefully not using versioning namespace