Use same tcl initialization as in OpenROAD
In https://github.com/The-OpenROAD-Project/OpenROAD/pull/10041 we have a new way to initializa the tcl subsystem which will allow to be entirely independent of separate files once we can switch to Tcl9. Signed-off-by: Henner Zeller <h.zeller@acm.org>
This commit is contained in:
parent
3d2bcb1dd1
commit
385f4fdb79
2
BUILD
2
BUILD
|
|
@ -272,7 +272,6 @@ cc_binary(
|
||||||
"app/Main.cc",
|
"app/Main.cc",
|
||||||
":StaApp",
|
":StaApp",
|
||||||
":StaTclInitVar",
|
":StaTclInitVar",
|
||||||
"//bazel:runfiles",
|
|
||||||
],
|
],
|
||||||
copts = [
|
copts = [
|
||||||
"-Wno-error",
|
"-Wno-error",
|
||||||
|
|
@ -297,6 +296,7 @@ cc_binary(
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
":opensta_lib",
|
":opensta_lib",
|
||||||
|
"//bazel:tcl_library_init",
|
||||||
"@rules_cc//cc/runfiles",
|
"@rules_cc//cc/runfiles",
|
||||||
"@tcl_lang//:tcl",
|
"@tcl_lang//:tcl",
|
||||||
],
|
],
|
||||||
|
|
|
||||||
11
app/Main.cc
11
app/Main.cc
|
|
@ -30,6 +30,11 @@
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
#include <tcl.h>
|
#include <tcl.h>
|
||||||
|
|
||||||
|
#ifdef BAZEL_CURRENT_REPOSITORY
|
||||||
|
#include "bazel/tcl_library_init.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#if TCL_READLINE
|
#if TCL_READLINE
|
||||||
#include <tclreadline.h>
|
#include <tclreadline.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -109,6 +114,12 @@ staTclAppInit(int argc,
|
||||||
std::string_view init_filename,
|
std::string_view init_filename,
|
||||||
Tcl_Interp *interp)
|
Tcl_Interp *interp)
|
||||||
{
|
{
|
||||||
|
#ifdef BAZEL_CURRENT_REPOSITORY
|
||||||
|
if (in_bazel::SetupTclEnvironment(interp) == TCL_ERROR) {
|
||||||
|
return TCL_ERROR;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// source init.tcl
|
// source init.tcl
|
||||||
if (Tcl_Init(interp) == TCL_ERROR)
|
if (Tcl_Init(interp) == TCL_ERROR)
|
||||||
return TCL_ERROR;
|
return TCL_ERROR;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue