Skip to content

Commit 6b916a9

Browse files
committed
fix(ci): wire C library headers into ICU custom-libcxx deps
The patched bazel/BUILD.icu builds icuuc/icui18n with -nostdinc++ and the custom libc++ headers, so their include_next C-compat wrappers hit the same dead-end as the v8 targets: no glibc headers in the search path, C symbols like memcpy/memset unresolved (cmemory.h errors). Add rusty_v8_c_library_headers to CUSTOM_LIBCXX_DEPS alongside the headers/runtime wrappers.
1 parent b3f194c commit 6b916a9

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

patches/v8_bazel_rules.patch

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ diff --git a/orig/v8-14.9.207.2/bazel/BUILD.icu b/mod/v8-14.9.207.2/bazel/BUILD.
384384
index 5fda2f4..8c3c372 100644
385385
--- a/orig/v8-14.9.207.2/bazel/BUILD.icu
386386
+++ b/mod/v8-14.9.207.2/bazel/BUILD.icu
387-
@@ -1,3 +1,24 @@
387+
@@ -1,3 +1,25 @@
388388
+load("@rules_cc//cc:defs.bzl", "cc_library")
389389
+
390390
+CUSTOM_LIBCXX_COPTS = select({
@@ -402,14 +402,15 @@ index 5fda2f4..8c3c372 100644
402402
+ "@v8//:is_v8_use_rusty_v8_custom_libcxx": [
403403
+ "@@//third_party/v8:rusty_v8_custom_libcxx_headers",
404404
+ "@@//third_party/v8:rusty_v8_custom_libcxx_runtime",
405+
+ "@@//third_party/v8:rusty_v8_c_library_headers",
405406
+ ],
406407
+ "//conditions:default": [],
407408
+})
408409
+
409410
# Copyright 2021 the V8 project authors. All rights reserved.
410411
# Use of this source code is governed by a BSD-style license that can be
411412
# found in the LICENSE file.
412-
@@ -16,15 +37,12 @@ cc_library(
413+
@@ -16,15 +38,12 @@ cc_library(
413414
]),
414415
copts = select({
415416
"@platforms//os:windows": [
@@ -427,15 +428,15 @@ index 5fda2f4..8c3c372 100644
427428
data = [":icudata"],
428429
defines = [
429430
"HAVE_DLOPEN=0",
430-
@@ -54,6 +72,7 @@ cc_library(
431+
@@ -54,6 +73,7 @@ cc_library(
431432
"U_ICUDATAENTRY_IN_COMMON",
432433
],
433434
tags = ["requires-rtti"],
434435
+ deps = CUSTOM_LIBCXX_DEPS,
435436
alwayslink = 1,
436437
)
437438

438-
@@ -65,19 +84,16 @@ cc_library(
439+
@@ -65,19 +85,16 @@ cc_library(
439440
]),
440441
copts = select({
441442
"@platforms//os:windows": [
@@ -458,7 +459,7 @@ index 5fda2f4..8c3c372 100644
458459
alwayslink = 1,
459460
)
460461

461-
@@ -93,13 +109,10 @@ cc_library(
462+
@@ -93,13 +110,10 @@ cc_library(
462463
]),
463464
copts = select({
464465
"@platforms//os:windows": [
@@ -474,7 +475,7 @@ index 5fda2f4..8c3c372 100644
474475
include_prefix = "third_party/icu",
475476
local_defines = [
476477
"U_COMMON_IMPLEMENTATION",
477-
@@ -108,6 +121,6 @@ cc_library(
478+
@@ -108,6 +122,6 @@ cc_library(
478479
deps = [
479480
":icui18n",
480481
":icuuc",

0 commit comments

Comments
 (0)