Skip to content

Commit

Permalink
Fix all buck2 targets errors
Browse files Browse the repository at this point in the history
  • Loading branch information
bigfootjon committed May 10, 2024
1 parent 916a985 commit d063997
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 27 deletions.
5 changes: 3 additions & 2 deletions .buckconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ none = none
[cell_aliases]
config = prelude
ovr_config = prelude
fbcode = none
fbsource = none
fbcode = shim
fbsource = shim
fbcode_macros = shim
buck = none
bazel_skylib = shim

[parser]
target_platform_detector_spec = target:root//...->prelude//platforms:default
2 changes: 1 addition & 1 deletion folly/experimental/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ cpp_library(
"//folly:memory",
"//folly:string",
"//folly/ext:test_ext",
"//folly/facebook:test_ext",
# @fb-only: "//folly/facebook:test_ext",
"//folly/portability:fcntl",
],
exported_deps = [
Expand Down
16 changes: 8 additions & 8 deletions folly/experimental/exception_tracer/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ cpp_library(
headers = ["ExceptionTracerLib.h"],
compiler_flags = select({
"DEFAULT": [],
"ovr_config//third-party/libgcc:11.x": ["-DFOLLY_STATIC_LIBSTDCXX=1"],
# @fb-only: "ovr_config//third-party/libgcc:11.x": ["-DFOLLY_STATIC_LIBSTDCXX=1"],
}),
exported_linker_flags = select({
"DEFAULT": [],
"ovr_config//third-party/libgcc:11.x": [
"-Wl,--wrap=__cxa_throw",
"-Wl,--wrap=__cxa_rethrow",
"-Wl,--wrap=__cxa_begin_catch",
"-Wl,--wrap=__cxa_end_catch",
"-Wl,--wrap=_ZSt17rethrow_exceptionNSt15__exception_ptr13exception_ptrE",
],
# @fb-only: "ovr_config//third-party/libgcc:11.x": [
# @fb-only: "-Wl,--wrap=__cxa_throw",
# @fb-only: "-Wl,--wrap=__cxa_rethrow",
# @fb-only: "-Wl,--wrap=__cxa_begin_catch",
# @fb-only: "-Wl,--wrap=__cxa_end_catch",
# @fb-only: "-Wl,--wrap=_ZSt17rethrow_exceptionNSt15__exception_ptr13exception_ptrE",
# @fb-only: ],
}),
link_whole = True,
supports_python_dlopen = True,
Expand Down
2 changes: 1 addition & 1 deletion folly/experimental/symbolizer/tool/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@fbcode_macros//build_defs:cpp_binary.bzl", "cpp_binary")
load("@fbcode_macros//build_defs:export_files.bzl", "export_file")
load("//antlir/fbpkg:fbpkg.bzl", "fbpkg")
load("@fbcode//antlir/fbpkg:fbpkg.bzl", "fbpkg")

oncall("fbcode_entropy_wardens_folly")

Expand Down
10 changes: 5 additions & 5 deletions folly/python/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ cpp_library(
],
headers = [
"executor.h",
":executor__executor_api.h",
# @fb-only: ":executor__executor_api.h",
],
# TODO(T36778537): Cython-generated `*_api.h` headers aren't modular.
modular_headers = False,
Expand Down Expand Up @@ -124,7 +124,7 @@ cpp_library(
exported_deps = [
"fbsource//third-party/python:python", # Python.h
":asyncio_executor",
":executor__cython-lib",
# @fb-only: ":executor__cython-lib",
"//folly:executor",
"//folly/futures:core",
],
Expand Down Expand Up @@ -155,7 +155,7 @@ cpp_library(
exported_deps = [
"fbsource//third-party/python:python", # Python.h
":asyncio_executor",
":executor__cython-lib",
# @fb-only: ":executor__cython-lib",
"//folly:cancellation_token",
"//folly:executor",
"//folly/experimental/coro:task",
Expand All @@ -182,7 +182,7 @@ cpp_library(
srcs = ["fibers.cpp"],
headers = [
"fibers.h",
":fibers__fiber_manager_api.h",
# @fb-only: ":fibers__fiber_manager_api.h",
],
# TODO(T36778537): Cython-generated `*_api.h` headers aren't modular.
modular_headers = False,
Expand Down Expand Up @@ -246,7 +246,7 @@ cpp_library(
srcs = ["iobuf.cpp"],
headers = [
"iobuf.h",
":iobuf__iobuf_api.h",
# @fb-only: ":iobuf__iobuf_api.h",
],
# TODO(T36778537): Cython-generated `*_api.h` headers aren't modular.
modular_headers = False,
Expand Down
20 changes: 10 additions & 10 deletions folly/support/test/BUCK
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
load("@fbcode_macros//build_defs:cpp_binary.bzl", "cpp_binary")
load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
load("//gdb/scripts/tests/common:gdb_unittest.bzl", "gdb_unittest")
# @fb-only: load("//gdb/scripts/tests/common:gdb_unittest.bzl", "gdb_unittest")

oncall("fbcode_entropy_wardens_folly")

Expand All @@ -27,12 +27,12 @@ cpp_binary(
)

# Test all of the printers in the folly gdb extension
gdb_unittest(
name = "test",
binary = "main",
script = "runtest.gdb",
skip_modes = [
"dev",
"opt*",
],
)
# @fb-only: gdb_unittest(
# @fb-only: name = "test",
# @fb-only: binary = "main",
# @fb-only: script = "runtest.gdb",
# @fb-only: skip_modes = [
# @fb-only: "dev",
# @fb-only: "opt*",
# @fb-only: ],
# @fb-only: )

0 comments on commit d063997

Please sign in to comment.