We're not using runfiles anymore, don't use associated macro define.
We used to use runfiles to work with tcl dependencies. Since we don't need that anymore, just add a regular `BAZEL_BUILD` define to choose the behavior in the bazel build and remove the unneeded dependency. Signed-off-by: Henner Zeller <h.zeller@acm.org>
This commit is contained in:
parent
d468d14fdc
commit
685f006f15
|
|
@ -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",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue