File tree Expand file tree Collapse file tree 2 files changed +5
-24
lines changed Expand file tree Collapse file tree 2 files changed +5
-24
lines changed Original file line number Diff line number Diff line change @@ -14,7 +14,7 @@ rust_library(
14
14
],
15
15
visibility = ["//visibility:public" ],
16
16
deps = [
17
- ":core-lib " ,
17
+ ":core" ,
18
18
"@crates.io//:foldhash" ,
19
19
],
20
20
)
@@ -70,19 +70,14 @@ rust_binary(
70
70
71
71
cc_library (
72
72
name = "core" ,
73
+ srcs = ["src/cxx.cc" ],
73
74
hdrs = ["include/cxx.h" ],
74
75
include_prefix = "rust" ,
76
+ linkstatic = True ,
75
77
strip_include_prefix = "include" ,
76
78
visibility = ["//visibility:public" ],
77
79
)
78
80
79
- cc_library (
80
- name = "core-lib" ,
81
- srcs = ["src/cxx.cc" ],
82
- hdrs = ["include/cxx.h" ],
83
- linkstatic = True ,
84
- )
85
-
86
81
rust_proc_macro (
87
82
name = "cxxbridge-macro" ,
88
83
srcs = glob (["macro/src/*.rs" ]),
@@ -141,4 +136,4 @@ platform(
141
136
"@platforms//os:windows" ,
142
137
"@bazel_tools//tools/cpp:clang-cl" ,
143
138
],
144
- )
139
+ )
Original file line number Diff line number Diff line change @@ -35,22 +35,8 @@ rust_cxx_bridge(
35
35
hdrs = glob (["*.h" ]),
36
36
include_prefix = "kj-rs" ,
37
37
deps = [
38
- ":cxx" ,
39
38
"@capnp-cpp//src/kj:kj" ,
40
39
"@capnp-cpp//src/kj:kj-async" ,
41
- "@workerd-cxx//:cxx " ,
40
+ "@workerd-cxx//:core " ,
42
41
],
43
42
)
44
-
45
- genrule (
46
- name = "cxx/generated" ,
47
- outs = ["cxx.h" ],
48
- cmd = "$(location @workerd-cxx//:codegen) --header > \" $@\" " ,
49
- tools = ["@workerd-cxx//:codegen" ],
50
- )
51
-
52
- cc_library (
53
- name = "cxx" ,
54
- hdrs = ["cxx.h" ],
55
- include_prefix = "rust" ,
56
- )
You can’t perform that action at this time.
0 commit comments