From c0392cb9231121849821e6f2bb4d04b0ba728018 Mon Sep 17 00:00:00 2001 From: storypku Date: Thu, 9 Jul 2020 16:07:03 -0700 Subject: [PATCH] Bazel: move general purpose systemlibs(-lrt,-lm,-pthread,...) into linkopts --- cyber/BUILD | 4 ++-- cyber/tools/cyber_monitor/BUILD | 2 +- cyber/tools/cyber_recorder/BUILD | 2 +- modules/tools/visualizer/BUILD | 4 +++- third_party/BUILD | 35 +++----------------------------- 5 files changed, 10 insertions(+), 37 deletions(-) diff --git a/cyber/BUILD b/cyber/BUILD index e52e02784c..509acfbef7 100644 --- a/cyber/BUILD +++ b/cyber/BUILD @@ -20,11 +20,11 @@ cc_binary( "mainboard/module_controller.cc", "mainboard/module_controller.h", ], + linkopts = ["-pthread"], linkstatic = False, deps = [ ":cyber_core", "//cyber/proto:dag_conf_cc_proto", - "//third_party:pthread", ], ) @@ -59,6 +59,7 @@ cc_library( name = "cyber_core", srcs = ["cyber.cc"], hdrs = ["cyber.h"], + linkopts = ["-lrt"], deps = [ "//cyber:binary", "//cyber:init", @@ -99,7 +100,6 @@ cc_library( "//cyber/transport", "//cyber/transport:participant", "//cyber/transport:sub_listener", - "//third_party:rt", "//third_party:uuid", "@com_google_glog//:glog", "@com_google_protobuf//:protobuf", diff --git a/cyber/tools/cyber_monitor/BUILD b/cyber/tools/cyber_monitor/BUILD index 1d6a487f6e..9789791cea 100644 --- a/cyber/tools/cyber_monitor/BUILD +++ b/cyber/tools/cyber_monitor/BUILD @@ -13,6 +13,7 @@ cc_binary( "renderable_message.cc", "screen.cc", ], + linkopts = ["-pthread"], deps = [ ":cyber_topology_message", ":general_channel_message", @@ -20,7 +21,6 @@ cc_binary( "//cyber:init", "//cyber/service_discovery:topology_manager", "//third_party:ncurses", - "//third_party:pthread", ], ) diff --git a/cyber/tools/cyber_recorder/BUILD b/cyber/tools/cyber_recorder/BUILD index 865a32ce20..14102e48a3 100644 --- a/cyber/tools/cyber_recorder/BUILD +++ b/cyber/tools/cyber_recorder/BUILD @@ -6,6 +6,7 @@ package(default_visibility = ["//visibility:public"]) cc_binary( name = "cyber_recorder", srcs = ["main.cc"], + linkopts = ["-pthread"], deps = [ ":info", ":player", @@ -15,7 +16,6 @@ cc_binary( "//cyber:init", "//cyber/common:file", "//cyber/common:time_conversion", - "//third_party:pthread", ], ) diff --git a/modules/tools/visualizer/BUILD b/modules/tools/visualizer/BUILD index 771ef746c7..e3458efe9a 100644 --- a/modules/tools/visualizer/BUILD +++ b/modules/tools/visualizer/BUILD @@ -11,11 +11,13 @@ cc_binary( includes = [ ".", ], + linkopts = [ + "-pthread", + ], deps = [ ":visualizer_lib", "//third_party:console_bridge", "//third_party:glvnd", - "//third_party:pthread", "@fastrtps", "@qt//:qt_core", "@qt//:qt_gui", diff --git a/third_party/BUILD b/third_party/BUILD index f6bc2f88ba..af8140f8a3 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -2,22 +2,6 @@ load("@rules_cc//cc:defs.bzl", "cc_library") package(default_visibility = ["//visibility:public"]) -# Libs provided by the system. - -cc_library( - name = "adolc", - deps = [ - "@adolc", - ], -) - -cc_library( - name = "ipopt", - deps = [ - "@ipopt", - ], -) - cc_library( name = "libtorch", deps = select({ @@ -30,28 +14,15 @@ cc_library( }), ) +# systemlibs +# TODO(infra): all the system libs should have its own section + # libncurses5-dev cc_library( name = "ncurses", 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 cc_library( name = "sqlite3", -- GitLab