From 797723ec838709ddeba0c104e30727ee0b7ac8ca Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Tue, 29 Jun 2021 00:13:28 -0700 Subject: [PATCH] Reland "Roll src/buildtools/third_party/libc++/trunk/ 8fa879467..79a2e924d (426 commits)" https://chromium-review.googlesource.com/c/chromium/src/+/2988699 --- BUILD.gn | 3 ++- script/nan-spec-runner.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 6cc1a63394d30..e89984966f436 100644 --- 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 index 32db5fda7d387..5bd0faa6da5e6 100644 --- 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'