Musl: fix build patch

bblanchon · Nov 22, 2024 · a53a66d · a53a66d
1 parent 7a29ca2
commit a53a66d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/patches/musl/build.patch b/patches/musl/build.patch
@@ -1,5 +1,5 @@
 diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
-index 26a23e459..666d775c3 100644
+index 8e0c3761f..0031b3c42 100644
 --- a/config/BUILDCONFIG.gn
 +++ b/config/BUILDCONFIG.gn
 @@ -135,6 +135,9 @@ declare_args() {
@@ -12,7 +12,7 @@ index 26a23e459..666d775c3 100644
    # Set to true when compiling with the Clang compiler.
    is_clang = current_os != "linux" ||
               (current_cpu != "s390x" && current_cpu != "s390" &&
-@@ -237,7 +240,9 @@ if (target_os == "android") {
+@@ -247,7 +250,9 @@ if (target_os == "android") {
    _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
  } else if (target_os == "chromeos" || target_os == "linux") {
    # See comments in build/toolchain/cros/BUILD.gn about board compiles.
@@ -24,15 +24,15 @@ index 26a23e459..666d775c3 100644
    } else {
      _default_toolchain = "//build/toolchain/linux:$target_cpu"
 diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
-index f991e525c..ff42e2799 100644
+index f58320b88..858fd54cc 100644
 --- a/config/compiler/BUILD.gn
 +++ b/config/compiler/BUILD.gn
-@@ -379,7 +379,7 @@ config("compiler") {
-         } else {
-           cflags += [ "-fstack-protector" ]
+@@ -369,7 +369,7 @@ config("compiler") {
          }
--      } else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
-+      } else if ((is_posix && !is_chromeos && !is_nacl && !is_musl) || is_fuchsia) {
+       } else if (is_chromeos) {
+         cflags += [ "-fstack-protector-strong" ]
+-      } else if ((is_posix && !is_nacl) || is_fuchsia) {
++      } else if ((is_posix && !is_nacl && !is_musl) || is_fuchsia) {
          if (current_os != "aix") {
            # Not available on aix.
            cflags += [ "-fstack-protector" ]