diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2013-10-05 16:44:05 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2013-10-05 16:44:05 (GMT) |
| commit | c68a9c8be3e79f9ba64c9b1b55773fb8defa3719 (patch) | |
| tree | a19cf78ab60b96ac97e2e8394422ee9b96585607 /win/tcl.m4 | |
| parent | a9019a7733cf3e446631c05020aa0ec515a313b1 (diff) | |
| parent | d10e74e4a937c4ba1e59cf2bad549282688ff48e (diff) | |
| download | tcl-c68a9c8be3e79f9ba64c9b1b55773fb8defa3719.zip tcl-c68a9c8be3e79f9ba64c9b1b55773fb8defa3719.tar.gz tcl-c68a9c8be3e79f9ba64c9b1b55773fb8defa3719.tar.bz2 | |
Merge trunk. Restore buildability by adding 'scspec TCLAPI' in tclOOInt.decls.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -523,6 +523,7 @@ AC_DEFUN([SC_ENABLE_SYMBOLS], [ # RES # # MAKE_LIB +# MAKE_STUB_LIB # MAKE_EXE # MAKE_DLL # @@ -682,6 +683,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" @@ -709,9 +711,8 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LIBRARIES="\${SHARED_LIBRARIES}" fi # 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}' MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \ -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)" @@ -960,6 +961,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="" |