From 04ff04061bc27d1335fc0f30f71ae7d7d9c34aab Mon Sep 17 00:00:00 2001 From: Cullen Walsh Date: Thu, 3 Oct 2024 15:48:43 -0700 Subject: [PATCH] Fix buck2-oss-examples ci job Summary: Blame: D63653577 Reviewed By: christolliday Differential Revision: D63839068 fbshipit-source-id: 94874191418992b93acb783c43d6f26f534f52c6 --- shim/.buckconfig | 2 +- shim/PACKAGE | 5 +---- shim/shims.bzl | 6 +++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/shim/.buckconfig b/shim/.buckconfig index 682a01cfb..971b77525 100644 --- a/shim/.buckconfig +++ b/shim/.buckconfig @@ -11,7 +11,7 @@ fbcode = shim fbsource = shim fbcode_macros = shim bazel_skylib = shim -buck = none +buck = shim [external_cells] prelude = bundled diff --git a/shim/PACKAGE b/shim/PACKAGE index 782e6f913..ea35fecd1 100644 --- a/shim/PACKAGE +++ b/shim/PACKAGE @@ -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) diff --git a/shim/shims.bzl b/shim/shims.bzl index 5a03813b5..38770d725 100644 --- a/shim/shims.bzl +++ b/shim/shims.bzl @@ -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 + ")",