diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-08 18:34:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-10-08 18:34:09 (GMT) |
| commit | ee49fa81d90d8396e545d07c2f5a40a48130a9dc (patch) | |
| tree | c319f2a6adec30276f52ed3c16da22e1f5498a75 /unix/Makefile.in | |
| parent | 3826a26f8a75540c7f3ff0b45f76498e85486dc9 (diff) | |
| parent | cc4dae5c0f418d304a44bb10c87c624b478b6441 (diff) | |
| download | tcl-ee49fa81d90d8396e545d07c2f5a40a48130a9dc.zip tcl-ee49fa81d90d8396e545d07c2f5a40a48130a9dc.tar.gz tcl-ee49fa81d90d8396e545d07c2f5a40a48130a9dc.tar.bz2 | |
Merge 8.6
Also fix startup problems on win32, when the encoding path contains invalid UTF-8 (reported by François Vogel)
Various other code cleanup, e.g. remove empty.zip file, as this didn't work quite as expected.
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c44cc77..d5324dc 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -714,7 +714,6 @@ ${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} \ @TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \ ${CC_SEARCH_FLAGS} -o ${TCL_EXE} - cat ${TOOL_DIR}/empty.zip >> ${TCL_EXE} # Must be empty so it doesn't conflict with rule for ${TCL_EXE} above ${NATIVE_TCLSH}: |