From 845f756eb6c42b9fb621412d344903c077d6110f Mon Sep 17 00:00:00 2001 From: Keeley Hammond Date: Sun, 23 May 2021 17:10:54 -0700 Subject: [PATCH] build: correct libcxx_objects build action name (#29296) --- BUILD.gn | 2 +- patches/chromium/build_libc_as_static_library.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index 784c7c18bc3..d249ac08278 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1427,7 +1427,7 @@ dist_zip("libcxxabi_headers_zip") { outputs = [ "$root_build_dir/libcxxabi_headers.zip" ] } -action("libcxx_zip") { +action("libcxx_objects_zip") { deps = [ "//buildtools/third_party/libc++" ] script = "build/zip_libcxx.py" outputs = [ "$root_build_dir/libcxx_objects.zip" ] diff --git a/patches/chromium/build_libc_as_static_library.patch b/patches/chromium/build_libc_as_static_library.patch index 96c7be7b00d..47a77b4ff15 100644 --- a/patches/chromium/build_libc_as_static_library.patch +++ b/patches/chromium/build_libc_as_static_library.patch @@ -7,7 +7,7 @@ Build libc++ as static library to compile and pass nan tests diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn -index 65f6e8585ad374ad59e7670babfedd2fbdfbaa43..0b1333bc8de626db056567f599be27808e1495e5 100644 +index 65f6e8585ad374ad59e7670babfedd2fbdfbaa43..7928a03447347f441e1e7dfc43f7a8e475eb120b 100644 --- a/buildtools/third_party/libc++/BUILD.gn +++ b/buildtools/third_party/libc++/BUILD.gn @@ -32,7 +32,11 @@ config("winver") { @@ -27,7 +27,7 @@ index 65f6e8585ad374ad59e7670babfedd2fbdfbaa43..0b1333bc8de626db056567f599be2780 # need to explicitly depend on libc++. visibility = [ "//build/config:common_deps", -+ "//electron:libcxx_zip", ++ "//electron:libcxx_objects_zip", "//third_party/catapult/devil:devil", ] if (is_linux && !is_chromeos) {