Merge pull request #371 from hzeller/feature-20260611-runfile

We're not using runfiles anymore, don't use associated macro define.
This commit is contained in:
Matt Liberty 2026-07-27 20:39:49 +00:00 committed by GitHub
commit 0c9c542334
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

View File

@ -280,6 +280,7 @@ cc_binary(
"-Wno-unused-parameter", "-Wno-unused-parameter",
"-Wno-sign-compare", "-Wno-sign-compare",
], ],
defines = ["BAZEL_BUILD"],
features = ["-use_header_modules"], features = ["-use_header_modules"],
includes = [ includes = [
"", "",
@ -293,7 +294,6 @@ cc_binary(
":opensta_lib", ":opensta_lib",
"//:tcl_readline_setup", "//:tcl_readline_setup",
"//bazel:tcl_library_init", "//bazel:tcl_library_init",
"@rules_cc//cc/runfiles",
"@tcl_lang//:tcl", "@tcl_lang//:tcl",
], ],
) )

View File

@ -31,7 +31,7 @@
#include <string_view> #include <string_view>
#include <tcl.h> #include <tcl.h>
#ifdef BAZEL_CURRENT_REPOSITORY #ifdef BAZEL_BUILD
#include "bazel/tcl_library_init.h" #include "bazel/tcl_library_init.h"
#include "src/tcl_readline_setup.h" #include "src/tcl_readline_setup.h"
#endif #endif
@ -115,7 +115,7 @@ staTclAppInit(int argc,
std::string_view init_filename, std::string_view init_filename,
Tcl_Interp *interp) Tcl_Interp *interp)
{ {
#ifdef BAZEL_CURRENT_REPOSITORY #ifdef BAZEL_BUILD
if (in_bazel::SetupTclEnvironment(interp) == TCL_ERROR) { if (in_bazel::SetupTclEnvironment(interp) == TCL_ERROR) {
return TCL_ERROR; return TCL_ERROR;
} }
@ -126,7 +126,7 @@ staTclAppInit(int argc,
return TCL_ERROR; return TCL_ERROR;
bool has_readline = false; bool has_readline = false;
#ifdef BAZEL_CURRENT_REPOSITORY #ifdef BAZEL_BUILD
has_readline = (ord::SetupTclReadlineLibrary(interp) == TCL_OK); has_readline = (ord::SetupTclReadlineLibrary(interp) == TCL_OK);
#endif #endif
#if TCL_READLINE #if TCL_READLINE