github-repos/benchmark
1
0
Fork 0
mirror of https://github.com/google/benchmark.git synced 2025-04-03 16:10:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert previous linker additions for FreeBSD as the problem is Bazel using /usr/bin/clang instead of /usr/bin/clang++ to link C++ code. (#1035)

Browse Source
This commit is contained in:
Yesudeep Mangalapilly 2020-09-03 02:59:15 -07:00 committed by GitHub
parent 4475ff6b8a
commit 4751550871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
BUILD.bazel
View File

@ -2,35 +2,14 @@ load("@rules_cc//cc:defs.bzl", "cc_library")
licenses(["notice"]) licenses(["notice"])
config_setting(
name = "freebsd",
constraint_values = [
"@platforms//os:freebsd",
],
visibility = [":__subpackages__"],
)
config_setting(
name = "openbsd",
constraint_values = [
"@platforms//os:openbsd",
],
visibility = [":__subpackages__"],
)
config_setting( config_setting(
name = "windows", name = "windows",
constraint_values = [ values = {
"@platforms//os:windows", "cpu": "x64_windows",
], },
visibility = [":__subpackages__"], visibility = [":__subpackages__"],
) )
BSD_LINKOPTS = [
"-pthread",
"-lm",
]
cc_library( cc_library(
name = "benchmark", name = "benchmark",
srcs = glob( srcs = glob(
@ -43,8 +22,6 @@ cc_library(
hdrs = ["include/benchmark/benchmark.h"], hdrs = ["include/benchmark/benchmark.h"],
linkopts = select({ linkopts = select({
":windows": ["-DEFAULTLIB:shlwapi.lib"], ":windows": ["-DEFAULTLIB:shlwapi.lib"],
":freebsd": BSD_LINKOPTS,
":openbsd": BSD_LINKOPTS,
"//conditions:default": ["-pthread"], "//conditions:default": ["-pthread"],
}), }),
strip_include_prefix = "include", strip_include_prefix = "include",

6
WORKSPACE
View File

@ -34,9 +34,3 @@ new_local_repository(
build_file = "@//bindings/python:python_headers.BUILD", build_file = "@//bindings/python:python_headers.BUILD",
path = "/usr/include/python3.6", # May be overwritten by setup.py. path = "/usr/include/python3.6", # May be overwritten by setup.py.
) )
http_archive(
name = "platforms",
strip_prefix = "platforms-master",
urls = ["https://github.com/bazelbuild/platforms/archive/master.zip"],
)