Skip to content

Commit

Permalink
Fix buck2-oss-examples ci job
Browse files Browse the repository at this point in the history
Summary: Blame: D63653577

Reviewed By: christolliday

Differential Revision: D63839068

fbshipit-source-id: 94874191418992b93acb783c43d6f26f534f52c6
  • Loading branch information
Cullen Walsh authored and facebook-github-bot committed Oct 3, 2024
1 parent 8ade92c commit 33c0782
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion shim/.buckconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ fbcode = shim
fbsource = shim
fbcode_macros = shim
bazel_skylib = shim
buck = none
buck = shim

[external_cells]
prelude = bundled
Expand Down
5 changes: 1 addition & 4 deletions shim/PACKAGE
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
# License, Version 2.0 found in the LICENSE-APACHE file in the root directory
# of this source tree.

load(":cfg.bzl", "SHIM_ALIASES", "set_cfg_constructor", "get_shim_modifiers")
load(":cfg.bzl", "get_shim_modifiers")
load("@prelude//cfg/modifier:set_cfg_modifiers.bzl", "set_cfg_modifiers")

# Activate cfg modifiers from CLI / PACKAGE / targets
set_cfg_constructor(SHIM_ALIASES)

modifiers = get_shim_modifiers()
set_cfg_modifiers(modifiers)
6 changes: 3 additions & 3 deletions shim/shims.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -328,15 +328,15 @@ def rust_protobuf_library(
build_env = build_env or {}
build_env.update(
{
"PROTOC": "$(exe buck//third-party/proto:protoc)",
"PROTOC_INCLUDE": "$(location buck//third-party/proto:google_protobuf)",
"PROTOC": "$(exe shim//third-party/proto:protoc)",
"PROTOC_INCLUDE": "$(location shim//third-party/proto:google_protobuf)",
},
)

prelude.genrule(
name = proto_name,
srcs = protos + [
"buck//third-party/proto:google_protobuf",
"shim//third-party/proto:google_protobuf",
],
out = ".",
cmd = "$(exe :" + build_name + ")",
Expand Down

0 comments on commit 33c0782

Please sign in to comment.