Skip to content

We're not using runfiles anymore, don't use associated macro define. #371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hzeller wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

We're not using runfiles anymore, don't use associated macro define. #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@ cc_binary(
"-Wno-unused-parameter",
"-Wno-sign-compare",
],
defines = ["BAZEL_BUILD"],
Comment thread
hzeller marked this conversation as resolved.
features = ["-use_header_modules"],
includes = [
"",
Expand All @@ -298,7 +299,6 @@ cc_binary(
":opensta_lib",
"//:tcl_readline_setup",
"//bazel:tcl_library_init",
"@rules_cc//cc/runfiles",
"@tcl_lang//:tcl",
],
)
Expand Down
6 changes: 3 additions & 3 deletions app/Main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <string_view>
#include <tcl.h>

#ifdef BAZEL_CURRENT_REPOSITORY
#ifdef BAZEL_BUILD
#include "bazel/tcl_library_init.h"
#include "src/tcl_readline_setup.h"
#endif
Expand Down Expand Up @@ -115,7 +115,7 @@ staTclAppInit(int argc,
std::string_view init_filename,
Tcl_Interp *interp)
{
#ifdef BAZEL_CURRENT_REPOSITORY
#ifdef BAZEL_BUILD
if (in_bazel::SetupTclEnvironment(interp) == TCL_ERROR) {
return TCL_ERROR;
}
Expand All @@ -126,7 +126,7 @@ staTclAppInit(int argc,
return TCL_ERROR;

bool has_readline = false;
#ifdef BAZEL_CURRENT_REPOSITORY
#ifdef BAZEL_BUILD
has_readline = (ord::SetupTclReadlineLibrary(interp) == TCL_OK);
#endif
#if TCL_READLINE
Expand Down