Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2…

…e924d (426 commits)" https://chromium-review.googlesource.com/c/chromium/src/+/2988699
electron · Jun 29, 2021 · 797723e · 797723e
1 parent 9691d6c
commit 797723e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -1404,7 +1404,8 @@ dist_zip("hunspell_dictionaries_zip") {
 }
 
 copy("libcxx_headers") {
-  sources = libcxx_headers + libcxx_licenses
+  sources = libcxx_headers + libcxx_licenses +
+            [ "//buildtools/third_party/libc++/__config_site" ]
   outputs = [ "$target_gen_dir/electron_libcxx_include/{{source_root_relative_dir}}/{{source_file_part}}" ]
 }
 

diff --git a/script/nan-spec-runner.js b/script/nan-spec-runner.js
@@ -38,7 +38,7 @@ async function main () {
   const cxxflags = [
     '-std=c++14',
     '-nostdinc++',
-    '-D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS', // needed by next line
+    `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++', 'trunk', 'include')}"`,
     `-isystem"${path.resolve(BASE, 'buildtools', 'third_party', 'libc++abi', 'trunk', 'include')}"`,
     '-fPIC'