diff options
| author | mdejong <mdejong> | 2002-01-11 19:17:49 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-01-11 19:17:49 (GMT) |
| commit | 4be7d9c1857bfeeb0d8a05897465e57d2ad18608 (patch) | |
| tree | feb5a1ea28acda1c071e2b80811618dd90677649 /unix/Makefile.in | |
| parent | 5e7ccf3264eac7d1be3cf6769e308a98fcc7da99 (diff) | |
| download | tcl-4be7d9c1857bfeeb0d8a05897465e57d2ad18608.zip tcl-4be7d9c1857bfeeb0d8a05897465e57d2ad18608.tar.gz tcl-4be7d9c1857bfeeb0d8a05897465e57d2ad18608.tar.bz2 | |
* 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.
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 11 |
1 files changed, 9 insertions, 2 deletions
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. |