Skip to content

Commit db8f471

Browse files
authored
Fix bazel build (#455)
This should have been in f80b725, but was missed. * Remove util/bits/bits.h and base/types.h from BUILD files; they have been deleted. * Bump abseil-cpp version. * Fix spinlock deps and includes.
1 parent f80b725 commit db8f471

File tree

8 files changed

+6
-19
lines changed

8 files changed

+6
-19
lines changed

src/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,6 @@ cc_library(
237237
],
238238
deps = [
239239
"//s2/base:commandlineflags",
240-
"//s2/base:types",
241240
"//s2/base:logging",
242241
"//s2/base:port",
243242
"//s2/base:spinlock",

src/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cc_configure = use_extension("@rules_cc//cc:extensions.bzl", "cc_configure_exten
1111
use_repo(cc_configure, "local_config_cc")
1212

1313
bazel_dep(name = "boringssl", version = "0.20250514.0")
14-
bazel_dep(name = "abseil-cpp", version = "20250127.1")
14+
bazel_dep(name = "abseil-cpp", version = "20250814.1")
1515
bazel_dep(name = "googletest", version = "1.17.0")
1616
bazel_dep(name = "rules_cc", version = "0.1.1")
1717

src/s2/base/BUILD

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ cc_library(
2121
],
2222
)
2323

24-
cc_library(
25-
name = "types",
26-
hdrs = ["types.h"],
27-
)
28-
2924
cc_library(
3025
name = "casts",
3126
hdrs = ["casts.h"],
@@ -46,7 +41,6 @@ cc_library(
4641
"commandlineflags_declare.h",
4742
],
4843
deps = [
49-
":types",
5044
"@abseil-cpp//absl/flags:flag",
5145
],
5246
)
@@ -63,4 +57,7 @@ cc_library(
6357
hdrs = [
6458
"spinlock.h",
6559
],
60+
deps = [
61+
"@abseil-cpp//absl/base:core_headers",
62+
],
6663
)

src/s2/base/spinlock.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include <atomic>
2020

21-
#include <absl/base/thread_annotations.h>
21+
#include "absl/base/thread_annotations.h"
2222

2323
class ABSL_LOCKABLE ABSL_ATTRIBUTE_WARN_UNUSED SpinLock {
2424
public:

src/s2/util/bits/BUILD

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@ package(default_visibility = ["//visibility:public"])
33
cc_library(
44
name = "bits",
55
srcs = ["bit-interleave.cc"],
6-
hdrs = [
7-
"bit-interleave.h",
8-
"bits.h",
9-
],
10-
deps = [
11-
"//s2/base:types",
12-
],
6+
hdrs = ["bit-interleave.h"],
137
)

src/s2/util/coding/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ cc_library(
1414
],
1515
deps = [
1616
"//s2/base:casts",
17-
"//s2/base:types",
1817
"//s2/base:logging",
1918
"//s2/base:malloc_extension",
2019
"//s2/base:port",

src/s2/util/math/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ cc_library(
1010
srcs = ["mathutil.cc"],
1111
hdrs = ["mathutil.h"],
1212
deps = [
13-
"//s2/base:types",
1413
"//s2/util/bits",
1514
"@abseil-cpp//absl/log",
1615
"@abseil-cpp//absl/log:check",

src/s2/util/math/exactfloat/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ cc_library(
55
srcs = ["exactfloat.cc"],
66
hdrs = ["exactfloat.h"],
77
deps = [
8-
"//s2/base:types",
98
"//s2/base:port",
109
"//s2/base:logging",
1110
"@abseil-cpp//absl/log:log",

0 commit comments

Comments
 (0)