From 4be7d9c1857bfeeb0d8a05897465e57d2ad18608 Mon Sep 17 00:00:00 2001 From: mdejong Date: Fri, 11 Jan 2002 19:17:49 +0000 Subject: * unix/Makefile.in: Burn Tcl build directory into tcltest executable to avoid crashes caused by ld loading a previously installed version of the tcl shared library. --- ChangeLog | 15 ++++++++++++--- unix/Makefile.in | 11 +++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59661da..9d73727 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,20 @@ -2002-01-10 Don Porter , Kevin Kenny - +2002-01-11 Mo DeJong + + * unix/Makefile.in: Burn Tcl build directory + into tcltest executable to avoid crashes caused + by ld loading a previously installed version + of the tcl shared library. + +2002-01-10 Don Porter , + Kevin Kenny * unix/tclLoadDld.c (TclpLoadFile): syntax error: unbalanced parens. Kevin notes that it's far from clear that this file is ever included in an actual build; Linux without dlopen appears to be a nonexistent configuration. -2002-01-08 Don Porter , Kevin Kenny +2002-01-08 Don Porter , + Kevin Kenny * doc/StaticPkg.3 (Tcl_StaticPackage): * generic/tcl.decls (Tcl_StaticPackage): @@ -44,6 +52,7 @@ TclGetStartupScriptFileName(). Broke Tk/wish. 2002-01-05 Don Porter + * doc/Tcl_Main.3: * generic/tclMain.c: Substantial rewrite and expanded documentation of Tcl_Main to correct a number of bugs and flaws: diff --git a/unix/Makefile.in b/unix/Makefile.in index e8de829..a18b24b 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.92 2001/12/20 02:17:58 dgp Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.93 2002/01/11 19:17:49 mdejong Exp $ VERSION = @TCL_VERSION@ @@ -444,11 +444,18 @@ tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${CC} ${LDFLAGS} ${TCLSH_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ @TCL_LD_SEARCH_FLAGS@ -o tclsh +# Resetting the LIB_RUNTIME_DIR below is required so that +# the generated tcltest executable gets the build directory +# burned into its ld search path. This keeps tcltest from +# picking up an already installed version of the Tcl library. + tcltest: ${TCLTEST_OBJS} ${TCL_LIB_FILE} ${BUILD_DLTEST} + $(MAKE) tcltest-real LIB_RUNTIME_DIR=`pwd` + +tcltest-real: ${CC} ${LDFLAGS} ${TCLTEST_OBJS} @TCL_BUILD_LIB_SPEC@ ${LIBS} \ @TCL_LD_SEARCH_FLAGS@ -o tcltest - # Note, in the target below TCL_LIBRARY needs to be set or else # "make test" won't work in the case where the compilation directory # isn't the same as the source directory. -- cgit v0.12