mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: correct libcxx_objects build action name (#29296)

Browse source
This commit is contained in:
Keeley Hammond 2021-05-23 17:10:54 -07:00 committed by GitHub
parent eb4f5e18e6
commit 845f756eb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
BUILD.gn
View file

@ -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" ]

4
patches/chromium/build_libc_as_static_library.patch
View file

@ -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) {