Commit 5cc6f207 authored by zhenren's avatar zhenren

chore: fix undefined reference to butil::ReadCommandLine when to build with bazel

parent 4eba8006
...@@ -15,6 +15,18 @@ config_setting( ...@@ -15,6 +15,18 @@ config_setting(
define_values = {"unittest": "true"}, define_values = {"unittest": "true"},
) )
config_setting(
name = "darwin",
values = {"cpu": "darwin"},
visibility = ["//visibility:public"],
)
config_setting(
name = "linux",
values = {"cpu": "linux"},
visibility = ["//visibility:public"],
)
COPTS = [ COPTS = [
"-DBTHREAD_USE_FAST_PTHREAD_MUTEX", "-DBTHREAD_USE_FAST_PTHREAD_MUTEX",
"-D__const__=", "-D__const__=",
...@@ -32,12 +44,16 @@ COPTS = [ ...@@ -32,12 +44,16 @@ COPTS = [
LINKOPTS = [ LINKOPTS = [
"-lpthread", "-lpthread",
"-ldl",
"-lz",
] + select({
":darwin": [],
"//conditions:default": [
"-lrt", "-lrt",
"-lssl", "-lssl",
"-lcrypto", "-lcrypto",
"-ldl", ],
"-lz", })
]
genrule( genrule(
name = "config_h", name = "config_h",
...@@ -103,7 +119,6 @@ BUTIL_SRCS = [ ...@@ -103,7 +119,6 @@ BUTIL_SRCS = [
"src/butil/files/scoped_file.cc", "src/butil/files/scoped_file.cc",
"src/butil/files/scoped_temp_dir.cc", "src/butil/files/scoped_temp_dir.cc",
"src/butil/file_util.cc", "src/butil/file_util.cc",
"src/butil/file_util_linux.cc",
"src/butil/file_util_posix.cc", "src/butil/file_util_posix.cc",
"src/butil/guid.cc", "src/butil/guid.cc",
"src/butil/guid_posix.cc", "src/butil/guid_posix.cc",
...@@ -118,6 +133,7 @@ BUTIL_SRCS = [ ...@@ -118,6 +133,7 @@ BUTIL_SRCS = [
"src/butil/memory/weak_ptr.cc", "src/butil/memory/weak_ptr.cc",
"src/butil/posix/file_descriptor_shuffle.cc", "src/butil/posix/file_descriptor_shuffle.cc",
"src/butil/posix/global_descriptors.cc", "src/butil/posix/global_descriptors.cc",
"src/butil/process_util.cc",
"src/butil/rand_util.cc", "src/butil/rand_util.cc",
"src/butil/rand_util_posix.cc", "src/butil/rand_util_posix.cc",
"src/butil/fast_rand.cpp", "src/butil/fast_rand.cpp",
...@@ -133,7 +149,6 @@ BUTIL_SRCS = [ ...@@ -133,7 +149,6 @@ BUTIL_SRCS = [
"src/butil/strings/string_util.cc", "src/butil/strings/string_util.cc",
"src/butil/strings/string_util_constants.cc", "src/butil/strings/string_util_constants.cc",
"src/butil/strings/stringprintf.cc", "src/butil/strings/stringprintf.cc",
"src/butil/strings/sys_string_conversions_posix.cc",
"src/butil/strings/utf_offset_string_conversions.cc", "src/butil/strings/utf_offset_string_conversions.cc",
"src/butil/strings/utf_string_conversion_utils.cc", "src/butil/strings/utf_string_conversion_utils.cc",
"src/butil/strings/utf_string_conversions.cc", "src/butil/strings/utf_string_conversions.cc",
...@@ -141,7 +156,6 @@ BUTIL_SRCS = [ ...@@ -141,7 +156,6 @@ BUTIL_SRCS = [
"src/butil/synchronization/condition_variable_posix.cc", "src/butil/synchronization/condition_variable_posix.cc",
"src/butil/synchronization/waitable_event_posix.cc", "src/butil/synchronization/waitable_event_posix.cc",
"src/butil/threading/non_thread_safe_impl.cc", "src/butil/threading/non_thread_safe_impl.cc",
"src/butil/threading/platform_thread_linux.cc",
"src/butil/threading/platform_thread_posix.cc", "src/butil/threading/platform_thread_posix.cc",
"src/butil/threading/simple_thread.cc", "src/butil/threading/simple_thread.cc",
"src/butil/threading/thread_checker_impl.cc", "src/butil/threading/thread_checker_impl.cc",
...@@ -177,8 +191,82 @@ BUTIL_SRCS = [ ...@@ -177,8 +191,82 @@ BUTIL_SRCS = [
"src/butil/containers/case_ignored_flat_map.cpp", "src/butil/containers/case_ignored_flat_map.cpp",
"src/butil/iobuf.cpp", "src/butil/iobuf.cpp",
"src/butil/popen.cpp", "src/butil/popen.cpp",
] ] + select({
":darwin": [
"src/butil/time/time_mac.cc",
"src/butil/mac/scoped_mach_port.cc",
],
"//conditions:default": [
"src/butil/file_util_linux.cc",
"src/butil/threading/platform_thread_linux.cc",
"src/butil/strings/sys_string_conversions_posix.cc",
],
})
objc_library(
name = "macos_lib",
hdrs = [":config_h",
"src/butil/atomicops.h",
"src/butil/atomicops_internals_atomicword_compat.h",
"src/butil/atomicops_internals_mac.h",
"src/butil/base_export.h",
"src/butil/basictypes.h",
"src/butil/build_config.h",
"src/butil/compat.h",
"src/butil/compiler_specific.h",
"src/butil/containers/hash_tables.h",
"src/butil/debug/debugger.h",
"src/butil/debug/leak_annotations.h",
"src/butil/file_util.h",
"src/butil/file_descriptor_posix.h",
"src/butil/files/file_path.h",
"src/butil/files/file.h",
"src/butil/files/scoped_file.h",
"src/butil/lazy_instance.h",
"src/butil/logging.h",
"src/butil/mac/bundle_locations.h",
"src/butil/mac/foundation_util.h",
"src/butil/mac/scoped_cftyperef.h",
"src/butil/mac/scoped_typeref.h",
"src/butil/macros.h",
"src/butil/memory/aligned_memory.h",
"src/butil/memory/scoped_policy.h",
"src/butil/memory/scoped_ptr.h",
"src/butil/move.h",
"src/butil/port.h",
"src/butil/posix/eintr_wrapper.h",
"src/butil/scoped_generic.h",
"src/butil/strings/string16.h",
"src/butil/strings/string_piece.h",
"src/butil/strings/string_util.h",
"src/butil/strings/string_util_posix.h",
"src/butil/strings/sys_string_conversions.h",
"src/butil/synchronization/lock.h",
"src/butil/time/time.h",
"src/butil/time.h",
"src/butil/third_party/dynamic_annotations/dynamic_annotations.h",
"src/butil/threading/platform_thread.h",
"src/butil/threading/thread_restrictions.h",
"src/butil/threading/thread_id_name_manager.h",
"src/butil/type_traits.h",
],
non_arc_srcs = [
"src/butil/mac/bundle_locations.mm",
"src/butil/mac/foundation_util.mm",
"src/butil/file_util_mac.mm",
"src/butil/threading/platform_thread_mac.mm",
"src/butil/strings/sys_string_conversions_mac.mm",
],
deps = [
"@com_github_gflags_gflags//:gflags",
] + select({
":with_glog": ["@com_github_google_glog//:glog"],
"//conditions:default": [],
}),
includes = ["src/"],
enable_modules = True,
tags = ["manual"],
)
cc_library( cc_library(
name = "butil", name = "butil",
...@@ -199,6 +287,7 @@ cc_library( ...@@ -199,6 +287,7 @@ cc_library(
"@com_github_gflags_gflags//:gflags", "@com_github_gflags_gflags//:gflags",
] + select({ ] + select({
":with_glog": ["@com_github_google_glog//:glog"], ":with_glog": ["@com_github_google_glog//:glog"],
":darwin": [":macos_lib"],
"//conditions:default": [], "//conditions:default": [],
}), }),
includes = [ includes = [
......
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
config_setting(
name = "darwin",
values = {"cpu": "darwin"},
visibility = ["//visibility:public"],
)
SOURCES = ["db/builder.cc", SOURCES = ["db/builder.cc",
"db/c.cc", "db/c.cc",
"db/dbformat.cc", "db/dbformat.cc",
...@@ -63,8 +70,13 @@ cc_library( ...@@ -63,8 +70,13 @@ cc_library(
], ],
copts = [ copts = [
"-fno-builtin-memcmp", "-fno-builtin-memcmp",
"-DOS_LINUX",
"-DLEVELDB_PLATFORM_POSIX=1", "-DLEVELDB_PLATFORM_POSIX=1",
"-DLEVELDB_ATOMIC_PRESENT", "-DLEVELDB_ATOMIC_PRESENT",
], ],
defines = [
"LEVELDB_PLATFORM_POSIX",
] + select({
":darwin": ["OS_MACOSX"],
"//conditions:default": [],
}),
) )
\ No newline at end of file
load("//:bazel/brpc.bzl", "brpc_proto_library") load("//:bazel/brpc.bzl", "brpc_proto_library")
config_setting(
name = "darwin",
values = {"cpu": "darwin"},
visibility = ["//visibility:public"],
)
COPTS = [ COPTS = [
"-D__STDC_FORMAT_MACROS", "-D__STDC_FORMAT_MACROS",
"-DBTHREAD_USE_FAST_PTHREAD_MUTEX", "-DBTHREAD_USE_FAST_PTHREAD_MUTEX",
...@@ -27,12 +33,16 @@ COPTS = [ ...@@ -27,12 +33,16 @@ COPTS = [
LINKOPTS = [ LINKOPTS = [
"-lpthread", "-lpthread",
"-ldl",
"-lz",
] + select({
":darwin": [],
"//conditions:default": [
"-lrt", "-lrt",
"-lssl", "-lssl",
"-lcrypto", "-lcrypto",
"-ldl", ],
"-lz", })
]
TEST_BUTIL_SOURCES = [ TEST_BUTIL_SOURCES = [
"at_exit_unittest.cc", "at_exit_unittest.cc",
...@@ -48,7 +58,6 @@ TEST_BUTIL_SOURCES = [ ...@@ -48,7 +58,6 @@ TEST_BUTIL_SOURCES = [
"cpu_unittest.cc", "cpu_unittest.cc",
"crash_logging_unittest.cc", "crash_logging_unittest.cc",
"leak_tracker_unittest.cc", "leak_tracker_unittest.cc",
"proc_maps_linux_unittest.cc",
"stack_trace_unittest.cc", "stack_trace_unittest.cc",
"environment_unittest.cc", "environment_unittest.cc",
"file_util_unittest.cc", "file_util_unittest.cc",
...@@ -129,10 +138,15 @@ TEST_BUTIL_SOURCES = [ ...@@ -129,10 +138,15 @@ TEST_BUTIL_SOURCES = [
"iobuf_unittest.cpp", "iobuf_unittest.cpp",
"test_switches.cc", "test_switches.cc",
"scoped_locale.cc", "scoped_locale.cc",
"test_file_util_linux.cc",
#"popen_unittest.cpp", #"popen_unittest.cpp",
"butil_unittest_main.cpp", "butil_unittest_main.cpp",
] ] + select({
"@bazel_tools//tools/osx:darwin": [],
"//conditions:default": [
"test_file_util_linux.cc",
"proc_maps_linux_unittest.cc",
],
})
proto_library( proto_library(
name = "test_proto", name = "test_proto",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment