提交 c0392cb9 编写于 作者: S storypku 提交者: Xiangquan Xiao

Bazel: move general purpose systemlibs(-lrt,-lm,-pthread,...) into linkopts

上级 e5ad41b8
...@@ -20,11 +20,11 @@ cc_binary( ...@@ -20,11 +20,11 @@ cc_binary(
"mainboard/module_controller.cc", "mainboard/module_controller.cc",
"mainboard/module_controller.h", "mainboard/module_controller.h",
], ],
linkopts = ["-pthread"],
linkstatic = False, linkstatic = False,
deps = [ deps = [
":cyber_core", ":cyber_core",
"//cyber/proto:dag_conf_cc_proto", "//cyber/proto:dag_conf_cc_proto",
"//third_party:pthread",
], ],
) )
...@@ -59,6 +59,7 @@ cc_library( ...@@ -59,6 +59,7 @@ cc_library(
name = "cyber_core", name = "cyber_core",
srcs = ["cyber.cc"], srcs = ["cyber.cc"],
hdrs = ["cyber.h"], hdrs = ["cyber.h"],
linkopts = ["-lrt"],
deps = [ deps = [
"//cyber:binary", "//cyber:binary",
"//cyber:init", "//cyber:init",
...@@ -99,7 +100,6 @@ cc_library( ...@@ -99,7 +100,6 @@ cc_library(
"//cyber/transport", "//cyber/transport",
"//cyber/transport:participant", "//cyber/transport:participant",
"//cyber/transport:sub_listener", "//cyber/transport:sub_listener",
"//third_party:rt",
"//third_party:uuid", "//third_party:uuid",
"@com_google_glog//:glog", "@com_google_glog//:glog",
"@com_google_protobuf//:protobuf", "@com_google_protobuf//:protobuf",
......
...@@ -13,6 +13,7 @@ cc_binary( ...@@ -13,6 +13,7 @@ cc_binary(
"renderable_message.cc", "renderable_message.cc",
"screen.cc", "screen.cc",
], ],
linkopts = ["-pthread"],
deps = [ deps = [
":cyber_topology_message", ":cyber_topology_message",
":general_channel_message", ":general_channel_message",
...@@ -20,7 +21,6 @@ cc_binary( ...@@ -20,7 +21,6 @@ cc_binary(
"//cyber:init", "//cyber:init",
"//cyber/service_discovery:topology_manager", "//cyber/service_discovery:topology_manager",
"//third_party:ncurses", "//third_party:ncurses",
"//third_party:pthread",
], ],
) )
......
...@@ -6,6 +6,7 @@ package(default_visibility = ["//visibility:public"]) ...@@ -6,6 +6,7 @@ package(default_visibility = ["//visibility:public"])
cc_binary( cc_binary(
name = "cyber_recorder", name = "cyber_recorder",
srcs = ["main.cc"], srcs = ["main.cc"],
linkopts = ["-pthread"],
deps = [ deps = [
":info", ":info",
":player", ":player",
...@@ -15,7 +16,6 @@ cc_binary( ...@@ -15,7 +16,6 @@ cc_binary(
"//cyber:init", "//cyber:init",
"//cyber/common:file", "//cyber/common:file",
"//cyber/common:time_conversion", "//cyber/common:time_conversion",
"//third_party:pthread",
], ],
) )
......
...@@ -11,11 +11,13 @@ cc_binary( ...@@ -11,11 +11,13 @@ cc_binary(
includes = [ includes = [
".", ".",
], ],
linkopts = [
"-pthread",
],
deps = [ deps = [
":visualizer_lib", ":visualizer_lib",
"//third_party:console_bridge", "//third_party:console_bridge",
"//third_party:glvnd", "//third_party:glvnd",
"//third_party:pthread",
"@fastrtps", "@fastrtps",
"@qt//:qt_core", "@qt//:qt_core",
"@qt//:qt_gui", "@qt//:qt_gui",
......
...@@ -2,22 +2,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library") ...@@ -2,22 +2,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
# Libs provided by the system.
cc_library(
name = "adolc",
deps = [
"@adolc",
],
)
cc_library(
name = "ipopt",
deps = [
"@ipopt",
],
)
cc_library( cc_library(
name = "libtorch", name = "libtorch",
deps = select({ deps = select({
...@@ -30,28 +14,15 @@ cc_library( ...@@ -30,28 +14,15 @@ cc_library(
}), }),
) )
# systemlibs
# TODO(infra): all the system libs should have its own section
# libncurses5-dev # libncurses5-dev
cc_library( cc_library(
name = "ncurses", name = "ncurses",
linkopts = ["-lncurses"], linkopts = ["-lncurses"],
) )
cc_library(
name = "pthread",
linkopts = ["-pthread"],
)
# python3-dev
cc_library(
name = "python3",
linkopts = ["-lpython3.6m"],
)
cc_library(
name = "rt",
linkopts = ["-lrt"],
)
# libsqlite3-dev # libsqlite3-dev
cc_library( cc_library(
name = "sqlite3", name = "sqlite3",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册