diff --git a/.bazelrc b/.bazelrc index 377c4787b7..d7099e0a81 100644 --- a/.bazelrc +++ b/.bazelrc @@ -18,6 +18,7 @@ test --build_tests_only test --cache_test_results=no test --test_output=all -build:linux --cxxopt="-std=c++17" -build:macos --cxxopt="-std=c++17" +build:linux --cxxopt="-std=c++17" --linkopt="-pthread" +build:macos --cxxopt="-std=c++17" --linkopt="-pthread" build:clang-cl --cxxopt="-std=c++17" +build:windows --cxxopt="/std:c++17" diff --git a/BUILD b/BUILD index 64066de348..25fb842e36 100644 --- a/BUILD +++ b/BUILD @@ -1,6 +1,5 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") load("@com_github_grpc_grpc//bazel:cython_library.bzl", "pyx_library") -load("//bazel:fury.bzl", "COPTS") pyx_library( @@ -12,7 +11,6 @@ pyx_library( "python/pyfury/__init__.py", ]), cc_kwargs = dict( - copts = COPTS, linkstatic = 1, ), deps = [ @@ -28,7 +26,6 @@ pyx_library( "python/pyfury/lib/mmh3/__init__.py", ]), cc_kwargs = dict( - copts = COPTS, linkstatic = 1, ), deps = [ @@ -45,7 +42,6 @@ pyx_library( "python/pyfury/__init__.py", ]), cc_kwargs = dict( - copts = COPTS, linkstatic = 1, ), deps = [ @@ -66,7 +62,6 @@ pyx_library( "python/pyfury/format/*.pxi", ]), cc_kwargs = dict( - copts = COPTS, linkstatic = 1, ), deps = [ diff --git a/bazel/fury.bzl b/bazel/fury.bzl deleted file mode 100644 index bd8eb8a06d..0000000000 --- a/bazel/fury.bzl +++ /dev/null @@ -1 +0,0 @@ -COPTS = ["-pthread","-std=c++17"] diff --git a/src/fury/BUILD b/src/fury/BUILD index 768846eb1c..91e05bc5ca 100644 --- a/src/fury/BUILD +++ b/src/fury/BUILD @@ -1,9 +1,7 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "fury", - copts = COPTS, deps = [ "@local_config_pyarrow//:arrow", "//src/fury/row:fury_row_format", diff --git a/src/fury/columnar/BUILD b/src/fury/columnar/BUILD index ba2abb57c0..489e3c7492 100644 --- a/src/fury/columnar/BUILD +++ b/src/fury/columnar/BUILD @@ -1,12 +1,10 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "fury_columnar_format", srcs = ["arrow_writer.cc"], hdrs = ["arrow_writer.h"], strip_include_prefix = "/src", - copts = COPTS, deps = [ "@local_config_pyarrow//:arrow", "//src/fury/util:fury_util", "//src/fury/row:fury_row_format" ], @@ -18,7 +16,6 @@ cc_test( srcs = [ "arrow_writer_test.cc", ], - copts = COPTS, deps = [ ":fury_columnar_format", "@com_google_googletest//:gtest", @@ -30,7 +27,6 @@ cc_test( srcs = [ "convert_test.cc", ], - copts = COPTS, deps = [ ":fury_columnar_format", "@com_google_googletest//:gtest", diff --git a/src/fury/encoder/BUILD b/src/fury/encoder/BUILD index e6b3b26f74..adf927e970 100644 --- a/src/fury/encoder/BUILD +++ b/src/fury/encoder/BUILD @@ -1,5 +1,4 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "fury_encoder", @@ -11,14 +10,12 @@ cc_library( "//src/fury/row:fury_row_format", "//src/fury/meta:fury_meta" ], - copts = COPTS, visibility = ["//visibility:public"], ) cc_test( name = "row_encoder_test", srcs = glob(["*_test.cc"]), - copts = COPTS, deps = [ ":fury_encoder", "@com_google_googletest//:gtest", diff --git a/src/fury/meta/BUILD b/src/fury/meta/BUILD index 81b8b41477..fead554976 100644 --- a/src/fury/meta/BUILD +++ b/src/fury/meta/BUILD @@ -1,19 +1,16 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "fury_meta", srcs = glob(["*.cc"], exclude=["*test.cc"]), hdrs = glob(["*.h"]), strip_include_prefix = "/src", - copts = COPTS, visibility = ["//visibility:public"], ) cc_test( name = "preprocessor_test", srcs = ["preprocessor_test.cc"], - copts = COPTS, deps = [ ":fury_meta", "@com_google_googletest//:gtest", @@ -23,7 +20,6 @@ cc_test( cc_test( name = "field_info_test", srcs = ["field_info_test.cc"], - copts = COPTS, deps = [ ":fury_meta", "@com_google_googletest//:gtest", @@ -33,7 +29,6 @@ cc_test( cc_test( name = "type_traits_test", srcs = ["type_traits_test.cc"], - copts = COPTS, deps = [ ":fury_meta", "@com_google_googletest//:gtest", diff --git a/src/fury/row/BUILD b/src/fury/row/BUILD index d5eb1e2a7f..3ff956ef46 100644 --- a/src/fury/row/BUILD +++ b/src/fury/row/BUILD @@ -1,5 +1,4 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "fury_row_format", @@ -9,14 +8,12 @@ cc_library( deps = [ "@local_config_pyarrow//:arrow", "//src/fury/util:fury_util" ], - copts = COPTS, visibility = ["//visibility:public"], ) cc_test( name = "row_test", srcs = ["row_test.cc"], - copts = COPTS, deps = [ ":fury_row_format", "@com_google_googletest//:gtest", diff --git a/src/fury/thirdparty/BUILD b/src/fury/thirdparty/BUILD index 4fb525dbf8..6c0742e2c6 100644 --- a/src/fury/thirdparty/BUILD +++ b/src/fury/thirdparty/BUILD @@ -1,12 +1,10 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "libmmh3", srcs = ["MurmurHash3.cc"], hdrs = ["MurmurHash3.h"], strip_include_prefix = "/src", - copts = COPTS, alwayslink=True, linkstatic=True, visibility = ["//visibility:public"], diff --git a/src/fury/util/BUILD b/src/fury/util/BUILD index cac9e120da..78cbb2b0f1 100644 --- a/src/fury/util/BUILD +++ b/src/fury/util/BUILD @@ -1,13 +1,11 @@ load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test") -load("//bazel:fury.bzl", "COPTS") cc_library( name = "fury_util", srcs = glob(["*.cc"], exclude=["*test.cc"]), hdrs = glob(["*.h"]), strip_include_prefix = "/src", - copts = COPTS, alwayslink=True, linkstatic=True, deps = [ @@ -23,7 +21,6 @@ cc_library( cc_test( name = "time_util_test", srcs = ["time_util_test.cc"], - copts = COPTS, deps = [ ":fury_util", "@com_google_googletest//:gtest", @@ -33,7 +30,6 @@ cc_test( cc_test( name = "logging_test", srcs = ["logging_test.cc"], - copts = COPTS, deps = [ ":fury_util", "@com_google_googletest//:gtest", @@ -43,7 +39,6 @@ cc_test( cc_test( name = "status_test", srcs = ["status_test.cc"], - copts = COPTS, deps = [ ":fury_util", "@com_google_googletest//:gtest", @@ -53,7 +48,6 @@ cc_test( cc_test( name = "buffer_test", srcs = ["buffer_test.cc"], - copts = COPTS, deps = [ ":fury_util", "@com_google_googletest//:gtest",