Assume that BAZEL_CURRENT_REPOSITORY is always defined.

This should be the case in all Bazel versions starting with 6.0, cf. https://www.buildbuddy.io/blog/whats-new-in-bazel-6-0/#c-and-c.
phst · Jan 10, 2024 · 440940a · 440940a
1 parent 241c28b
commit 440940a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 33 deletions.
diff --git a/elisp/binary.cc b/elisp/binary.cc
@@ -39,10 +39,6 @@
 
 #include "elisp/process.h"
 
-#ifndef BAZEL_CURRENT_REPOSITORY
-#define BAZEL_CURRENT_REPOSITORY ""
-#endif
-
 namespace phst_rules_elisp {
 
 static absl::StatusOr<int> RunBinaryImpl(

diff --git a/elisp/binary_test.cc b/elisp/binary_test.cc
@@ -44,10 +44,6 @@
 #include "elisp/platform.h"
 #include "elisp/process.h"
 
-#ifndef BAZEL_CURRENT_REPOSITORY
-#define BAZEL_CURRENT_REPOSITORY ""
-#endif
-
 // IWYU pragma: no_include "gtest/gtest_pred_impl.h"
 // IWYU pragma: no_include <gmock/gmock-matchers.h>
 // IWYU pragma: no_include <gtest/gtest-matchers.h>

diff --git a/elisp/emacs.cc b/elisp/emacs.cc
@@ -39,10 +39,6 @@
 
 #include "elisp/process.h"
 
-#ifndef BAZEL_CURRENT_REPOSITORY
-#define BAZEL_CURRENT_REPOSITORY ""
-#endif
-
 namespace phst_rules_elisp {
 
 static absl::StatusOr<int> RunEmacsImpl(const NativeString& argv0,

diff --git a/elisp/process.cc b/elisp/process.cc
@@ -1,4 +1,4 @@
-// Copyright 2020, 2021, 2022, 2023 Google LLC
+// Copyright 2020, 2021, 2022, 2023, 2024 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -349,17 +349,11 @@ static absl::StatusOr<NativeString> ToNative(const std::string& string) {
 
 absl::StatusOr<Runfiles> Runfiles::Create(const std::string& source_repository,
                                           const NativeString& argv0) {
-#ifndef BAZEL_CURRENT_REPOSITORY
-  CHECK(source_repository.empty());
-#endif
   const absl::StatusOr<std::string> narrow_argv0 = ToNarrow(argv0);
   if (!narrow_argv0.ok()) return narrow_argv0.status();
   std::string error;
-  absl::Nullable<std::unique_ptr<Impl>> impl(Impl::Create(*narrow_argv0,
-#ifdef BAZEL_CURRENT_REPOSITORY
-                                                          source_repository,
-#endif
-                                                          &error));
+  absl::Nullable<std::unique_ptr<Impl>> impl(
+      Impl::Create(*narrow_argv0, source_repository, &error));
   if (impl == nullptr) {
     return absl::FailedPreconditionError(
         absl::StrCat("couldn’t create runfiles: ", error));
@@ -369,15 +363,9 @@ absl::StatusOr<Runfiles> Runfiles::Create(const std::string& source_repository,
 
 absl::StatusOr<Runfiles> Runfiles::CreateForTest(
     const std::string& source_repository) {
-#ifndef BAZEL_CURRENT_REPOSITORY
-  CHECK(source_repository.empty());
-#endif
   std::string error;
-  absl::Nullable<std::unique_ptr<Impl>> impl(Impl::CreateForTest(
-#ifdef BAZEL_CURRENT_REPOSITORY
-      source_repository,
-#endif
-      &error));
+  absl::Nullable<std::unique_ptr<Impl>> impl(
+      Impl::CreateForTest(source_repository, &error));
   if (impl == nullptr) {
     return absl::FailedPreconditionError(
         absl::StrCat("couldn’t create runfiles for test: ", error));

diff --git a/elisp/test.cc b/elisp/test.cc
@@ -39,10 +39,6 @@
 
 #include "elisp/process.h"
 
-#ifndef BAZEL_CURRENT_REPOSITORY
-#define BAZEL_CURRENT_REPOSITORY ""
-#endif
-
 namespace phst_rules_elisp {
 
 static absl::StatusOr<int> RunTestImpl(const std::vector<NativeString>& args) {