From e6cfbab12af4e0149eb7bceb25fb4bb470e017c3 Mon Sep 17 00:00:00 2001 From: apnadkarni Date: Wed, 20 May 2026 17:03:36 +0000 Subject: [PATCH] Proposed fix for [006bef5d75] on Unix. MingW and nmake pending. --- generic/tclInterp.c | 4 ++++ generic/tclPkgConfig.c | 4 ++++ unix/Makefile.in | 2 ++ 3 files changed, 10 insertions(+) diff --git a/generic/tclInterp.c b/generic/tclInterp.c index 9e34d39691..3fcedbef4c 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -507,6 +507,10 @@ LocatePreInitScript( TRY_PATH(TclJoinPath(3, pathParts, false)); +#ifdef CFG_BUILDTIME_SCRDIR + TRY_PATH(Tcl_NewStringObj(CFG_BUILDTIME_SCRDIR, -1)); +#endif + done: /* initScriptPtr != NULL => dirPtr holds dir of init.tcl */ if (initScriptPathPtr == NULL) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( diff --git a/generic/tclPkgConfig.c b/generic/tclPkgConfig.c index 9f0b8d18dc..b43d56c168 100644 --- a/generic/tclPkgConfig.c +++ b/generic/tclPkgConfig.c @@ -154,6 +154,10 @@ static Tcl_Config const cfg[] = { {"includedir,install", CFG_INSTALL_INCDIR}, {"docdir,install", CFG_INSTALL_DOCDIR}, + /* Build time paths to various stuff */ + + {"scriptdir,build", CFG_BUILDTIME_SCRDIR}, + /* Last entry, closes the array */ {NULL, NULL} }; diff --git a/unix/Makefile.in b/unix/Makefile.in index cdf77f1e0b..a2ae038d89 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1404,6 +1404,7 @@ tclInterp.o: $(GENERIC_DIR)/tclInterp.c -DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \ -DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \ -DCFG_RUNTIME_SCRDIR="\"$(TCL_LIBRARY)\"" \ + -DCFG_BUILDTIME_SCRDIR="\"$(TCL_BUILDTIME_LIBRARY)\"" \ $(GENERIC_DIR)/tclInterp.c tclIO.o: $(GENERIC_DIR)/tclIO.c $(IOHDR) @@ -1541,6 +1542,7 @@ tclPkgConfig.o: $(GENERIC_DIR)/tclPkgConfig.c -DCFG_RUNTIME_INCDIR="\"$(includedir)\"" \ -DCFG_RUNTIME_DOCDIR="\"$(mandir)\"" \ -DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \ + -DCFG_BUILDTIME_SCRDIR="\"$(TCL_BUILDTIME_LIBRARY)\"" \ $(GENERIC_DIR)/tclPkgConfig.c tclPosixStr.o: $(GENERIC_DIR)/tclPosixStr.c