summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-10-03 15:17:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-10-03 15:17:43 (GMT)
commitc09ca7b7b75b5cd4ce31f726e74fcfdbf011b255 (patch)
tree2c968deb625081f8b56053597584392aacc35f8a /win/tcl.m4
parentab9b922b76e5a364b81263128b3231b5bbd85c36 (diff)
downloadtcl-c09ca7b7b75b5cd4ce31f726e74fcfdbf011b255.zip
tcl-c09ca7b7b75b5cd4ce31f726e74fcfdbf011b255.tar.gz
tcl-c09ca7b7b75b5cd4ce31f726e74fcfdbf011b255.tar.bz2
When compiling with MSVC++, no longer link the stub library with msvcrt??.dll.
This way, workarounds in extensions like [http://core.tcl.tk/itcl/info/a961f0729c] are no longer necessary.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m48
1 files changed, 5 insertions, 3 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 7de3013..44fd47e 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -523,6 +523,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [
# RES
#
# MAKE_LIB
+# MAKE_STUB_LIB
# MAKE_EXE
# MAKE_DLL
#
@@ -663,6 +664,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
RC_DEFINE=--define
RES=res.o
MAKE_LIB="\${STLIB_LD} \[$]@"
+ MAKE_STUB_LIB="\${STLIB_LD} \[$]@"
POST_MAKE_LIB="\${RANLIB} \[$]@"
MAKE_EXE="\${CC} -o \[$]@"
LIBPREFIX="lib"
@@ -688,9 +690,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
runtime=
# Link with gcc since ld does not link to default libs like
- # -luser32 and -lmsvcrt by default. Make sure CFLAGS is
- # included so -mno-cygwin passed the correct libs to the linker.
- SHLIB_LD='${CC} -shared ${CFLAGS}'
+ # -luser32 and -lmsvcrt by default.
+ SHLIB_LD='${CC} -shared'
SHLIB_LD_LIBS='${LIBS}'
# Add SHLIB_LD_LIBS to the Make rule, not here.
MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
@@ -948,6 +949,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
RC_DEFINE=-d
RES=res
MAKE_LIB="\${STLIB_LD} -out:\[$]@"
+ MAKE_STUB_LIB="\${STLIB_LD} -nodefaultlib -out:\[$]@"
POST_MAKE_LIB=
MAKE_EXE="\${CC} -Fe\[$]@"
LIBPREFIX=""