Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3036d4557
Branches Tags
electron
/
patches
/
chromium
/
build_libc_as_static_library.patch

build_libc_as_static_library.patch 1.7 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: VerteDinde <[email protected]>
    3. 

  3. Date: Wed, 12 May 2021 13:19:19 -0700
    4. 

  4. Subject: build_libc++_as_static_library
    5. 

  5. 

  6. Build libc++ as static library to compile and pass
    7. 

  7. nan tests
    8. 

  8. 

  9. diff --git a/buildtools/third_party/libc++/BUILD.gn b/buildtools/third_party/libc++/BUILD.gn
    10. 

  10. index 448459ee94773786c9742eb16272b7c7c2078d7d..822a7e4e8cc7fd0d59c8c813c2108b369db6adac 100644
    11. 

  11. --- a/buildtools/third_party/libc++/BUILD.gn
    12. 

  12. +++ b/buildtools/third_party/libc++/BUILD.gn
    13. 

  13. @@ -44,7 +44,11 @@ config("winver") {
    14. 

  14.  if (libcxx_is_shared) {
    15. 

  15.    _libcxx_target_type = "shared_library"
    16. 

  16.  } else {
    17. 

  17. -  _libcxx_target_type = "source_set"
    18. 

  18. +  if (is_win) {
    19. 

  19. +    _libcxx_target_type = "source_set"
    20. 

  20. +  } else {
    21. 

  21. +    _libcxx_target_type = "static_library"
    22. 

  22. +  }
    23. 

  23.  }
    24. 

  24.  target(_libcxx_target_type, "libc++") {
    25. 

  25.    # Most things that need to depend on libc++ should do so via the implicit
    26. 

  26. @@ -52,6 +56,7 @@ target(_libcxx_target_type, "libc++") {
    27. 

  27.    # need to explicitly depend on libc++.
    28. 

  28.    visibility = [
    29. 

  29.      "//build/config:common_deps",
    30. 

  30. +    "//electron:libcxx_objects_zip",
    31. 

  31.      "//third_party/catapult/devil:devil",
    32. 

  32.    ]
    33. 

  33.    if (is_linux) {
    34. 

  34. diff --git a/buildtools/third_party/libc++abi/BUILD.gn b/buildtools/third_party/libc++abi/BUILD.gn
    35. 

  35. index b5c15a0ead70604150a14820d8a829a5aa55f981..f1f984285e39192f5e1a8c5418c13915f5aa110a 100644
    36. 

  36. --- a/buildtools/third_party/libc++abi/BUILD.gn
    37. 

  37. +++ b/buildtools/third_party/libc++abi/BUILD.gn
    38. 

  38. @@ -6,7 +6,7 @@ import("//build/config/android/config.gni")
    39. 

  39.  import("//build/config/c++/c++.gni")
    40. 

  40.  import("//build/config/unwind.gni")
    41. 

  41.  
    42. 

  42. -source_set("libc++abi") {
    43. 

  43. +static_library("libc++abi") {
    44. 

  44.    if (export_libcxxabi_from_executables) {
    45. 

  45.      visibility = [ "//build/config:executable_deps" ]
    46. 

  46.    } else {
    47.