Tcl Source Code

Changes On Branch death-to-dbgx
Login
Bounty program for improvements to Tcl and certain Tcl packages.

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch death-to-dbgx Excluding Merge-Ins

This is equivalent to a diff from 162c548406 to a1ba9f2960

2020-07-03
10:08
TIP #578 impelementation: Death to TCL_DBGX check-in: 834ef99124 user: jan.nijtmans tags: core-8-branch
2020-06-16
12:24
Make Tcl_GetIntForIndex() do reasonable things when endValue < -1 and when indexPtr == NULL. check-in: aed31dfc6d user: jan.nijtmans tags: core-8-branch
2020-06-15
14:14
Added DEPRECATED comment in tclConfig.sh.in (both UNIX and win32) Closed-Leaf check-in: a1ba9f2960 user: jan.nijtmans tags: death-to-dbgx
12:44
Merge 8.7 check-in: e98ba58f38 user: jan.nijtmans tags: strict-index-experiment
12:43
Merge 8.7 check-in: 6668ee34e6 user: jan.nijtmans tags: death-to-dbgx
2020-06-12
14:56
Merge 8.7 check-in: 77245e9add user: jan.nijtmans tags: trunk
14:49
Merge 8.6 check-in: 162c548406 user: jan.nijtmans tags: core-8-branch
14:44
rules.vc: No need to redefine values which are already the default. tclWinPort.h: Fix comment check-in: 9cde493d0c user: jan.nijtmans tags: core-8-6-branch
14:11
Merge 8.6 check-in: a065756d61 user: jan.nijtmans tags: core-8-branch

Changes to library/dde/pkgIndex.tcl.

     1      1   if {![package vsatisfies [package provide Tcl] 8.5-]} return
     2      2   if {[info sharedlibextension] != ".dll"} return
     3         -if {[::tcl::pkgconfig get debug]} {
     4         -    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14g.dll] dde]
     5         -} else {
     6         -    package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] dde]
     7         -}
            3  +package ifneeded dde 1.4.3 [list load [file join $dir tcldde14.dll] dde]

Changes to library/reg/pkgIndex.tcl.

     1      1   if {![package vsatisfies [package provide Tcl] 8.5-]} return
     2      2   if {[info sharedlibextension] != ".dll"} return
     3         -if {[::tcl::pkgconfig get debug]} {
     4         -    package ifneeded registry 1.3.5 \
     5         -            [list load [file join $dir tclreg13g.dll] registry]
     6         -} else {
     7         -    package ifneeded registry 1.3.5 \
     8         -            [list load [file join $dir tclreg13.dll] registry]
     9         -}
            3  +package ifneeded registry 1.3.5 \
            4  +        [list load [file join $dir tclreg13.dll] registry]

Changes to unix/tclConfig.sh.in.

    19     19   TCL_CC='@[email protected]'
    20     20   
    21     21   # -D flags for use with the C compiler.
    22     22   TCL_DEFS='@[email protected]'
    23     23   
    24     24   # TCL_DBGX used to be used to distinguish debug vs. non-debug builds.
    25     25   # This was a righteous pain so the core doesn't do that any more.
    26         -TCL_DBGX=
           26  +# DEPRECATED, will be removed in Tcl 9!
           27  +TCL_DBGX=''
    27     28   
    28     29   # Default flags used in an optimized and debuggable build, respectively.
    29     30   TCL_CFLAGS_DEBUG='@[email protected]'
    30     31   TCL_CFLAGS_OPTIMIZE='@[email protected]'
    31     32   
    32     33   # Default linker flags used in an optimized and debuggable build, respectively.
    33     34   TCL_LDFLAGS_DEBUG='@[email protected]'

Changes to win/Makefile.in.

    66     66   
    67     67   # Directory in which to install manual entries for Tcl's C library procedures:
    68     68   MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
    69     69   
    70     70   # Directory in which to install manual entries for the built-in Tcl commands:
    71     71   MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
    72     72   
    73         -# Libraries built with optimization switches have this additional extension
    74         -TCL_DBGX = @[email protected]
    75         -
    76     73   # warning flags
    77     74   CFLAGS_WARNING = @[email protected]
    78     75   
    79     76   # The default switches for optimization or debugging
    80     77   CFLAGS_DEBUG    = @[email protected]
    81     78   CFLAGS_OPTIMIZE	= @[email protected]
    82     79   

Changes to win/configure.

   665    665   CC_EXENAME
   666    666   CC_OBJNAME
   667    667   DEPARG
   668    668   EXTRA_CFLAGS
   669    669   CFG_TCL_EXPORT_FILE_SUFFIX
   670    670   CFG_TCL_UNSHARED_LIB_SUFFIX
   671    671   CFG_TCL_SHARED_LIB_SUFFIX
   672         -TCL_DBGX
   673    672   TCL_BIN_DIR
   674    673   TCL_SRC_DIR
   675    674   TCL_DLL_FILE
   676    675   TCL_BUILD_STUB_LIB_PATH
   677    676   TCL_BUILD_STUB_LIB_SPEC
   678    677   TCL_INCLUDE_SPEC
   679    678   TCL_STUB_LIB_PATH
................................................................................
  4178   4177   
  4179   4178   	if test "${SHARED_BUILD}" = "0" ; then
  4180   4179   	    # static
  4181   4180               { $as_echo "$as_me:${as_lineno-$LINENO}: result: using static flags" >&5
  4182   4181   $as_echo "using static flags" >&6; }
  4183   4182   	    runtime=
  4184   4183   	    LIBRARIES="\${STATIC_LIBRARIES}"
  4185         -	    EXESUFFIX="s\${DBGX}.exe"
         4184  +	    EXESUFFIX="s.exe"
  4186   4185   	else
  4187   4186   	    # dynamic
  4188   4187               { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
  4189   4188   $as_echo "using shared flags" >&6; }
  4190   4189   
  4191   4190   	    # ad-hoc check to see if CC supports -shared.
  4192   4191   	    if "${CC}" -shared 2>&1 | egrep ': -shared not supported' >/dev/null; then
................................................................................
  4193   4192   		as_fn_error $? "${CC} does not support the -shared option.
  4194   4193                   You will need to upgrade to a newer version of the toolchain." "$LINENO" 5
  4195   4194   	    fi
  4196   4195   
  4197   4196   	    runtime=
  4198   4197   	    # Add SHLIB_LD_LIBS to the Make rule, not here.
  4199   4198   
  4200         -	    EXESUFFIX="\${DBGX}.exe"
         4199  +	    EXESUFFIX=".exe"
  4201   4200   	    LIBRARIES="\${SHARED_LIBRARIES}"
  4202   4201   	fi
  4203   4202   	# Link with gcc since ld does not link to default libs like
  4204   4203   	# -luser32 and -lmsvcrt by default.
  4205   4204   	SHLIB_LD='${CC} -shared'
  4206   4205   	SHLIB_LD_LIBS='${LIBS}'
  4207   4206   	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[email protected] ${extra_ldflags} \
  4208   4207   	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[email protected])"
  4209   4208   	# DLLSUFFIX is separate because it is the building block for
  4210   4209   	# users of tclConfig.sh that may build shared or static.
  4211         -	DLLSUFFIX="\${DBGX}.dll"
  4212         -	LIBSUFFIX="\${DBGX}.a"
  4213         -	LIBFLAGSUFFIX="\${DBGX}"
         4210  +	DLLSUFFIX=".dll"
         4211  +	LIBSUFFIX=".a"
         4212  +	LIBFLAGSUFFIX=""
  4214   4213   	SHLIB_SUFFIX=.dll
  4215   4214   
  4216   4215   	EXTRA_CFLAGS="${extra_cflags}"
  4217   4216   
  4218   4217   	CFLAGS_DEBUG=-g
  4219   4218   	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
  4220   4219   	CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith"
................................................................................
  4296   4295       else
  4297   4296   	if test "${SHARED_BUILD}" = "0" ; then
  4298   4297   	    # static
  4299   4298               { $as_echo "$as_me:${as_lineno-$LINENO}: result: using static flags" >&5
  4300   4299   $as_echo "using static flags" >&6; }
  4301   4300   	    runtime=-MT
  4302   4301   	    LIBRARIES="\${STATIC_LIBRARIES}"
  4303         -	    EXESUFFIX="s\${DBGX}.exe"
         4302  +	    EXESUFFIX="s.exe"
  4304   4303   	else
  4305   4304   	    # dynamic
  4306   4305               { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
  4307   4306   $as_echo "using shared flags" >&6; }
  4308   4307   	    runtime=-MD
  4309   4308   	    # Add SHLIB_LD_LIBS to the Make rule, not here.
  4310   4309   	    LIBRARIES="\${SHARED_LIBRARIES}"
  4311         -	    EXESUFFIX="\${DBGX}.exe"
         4310  +	    EXESUFFIX=".exe"
  4312   4311   	    case "x`echo \${VisualStudioVersion}`" in
  4313   4312   		x1[4-9]*)
  4314   4313   		    lflags="${lflags} -nodefaultlib:libucrt.lib"
  4315   4314   		    ;;
  4316   4315   		*)
  4317   4316   		    ;;
  4318   4317   	    esac
  4319   4318   	fi
  4320   4319   	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[email protected]"
  4321   4320   	# DLLSUFFIX is separate because it is the building block for
  4322   4321   	# users of tclConfig.sh that may build shared or static.
  4323         -	DLLSUFFIX="\${DBGX}.dll"
  4324         -	LIBSUFFIX="\${DBGX}.lib"
  4325         -	LIBFLAGSUFFIX="\${DBGX}"
         4322  +	DLLSUFFIX=".dll"
         4323  +	LIBSUFFIX=".lib"
         4324  +	LIBFLAGSUFFIX=""
  4326   4325   
  4327   4326   	if test "$do64bit" != "no" ; then
  4328   4327   	    case "$do64bit" in
  4329   4328   		amd64|x64|yes)
  4330   4329   		    MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
  4331   4330   		    ;;
  4332   4331   		ia64)
................................................................................
  5172   5171     tcl_ok=no
  5173   5172   fi
  5174   5173   
  5175   5174   # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
  5176   5175       if test "$tcl_ok" = "no"; then
  5177   5176   	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
  5178   5177   	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
  5179         -	DBGX=""
  5180   5178   
  5181   5179   $as_echo "#define NDEBUG 1" >>confdefs.h
  5182   5180   
  5183   5181   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  5184   5182   $as_echo "no" >&6; }
  5185   5183   
  5186   5184   	$as_echo "#define TCL_CFG_OPTIMIZED 1" >>confdefs.h
  5187   5185   
  5188   5186       else
  5189   5187   	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
  5190   5188   	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
  5191         -	DBGX=g
  5192   5189   	if test "$tcl_ok" = "yes"; then
  5193   5190   	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
  5194   5191   $as_echo "yes (standard debugging)" >&6; }
  5195   5192   	fi
  5196   5193       fi
  5197   5194   
  5198   5195   
................................................................................
  5219   5216   	else
  5220   5217   	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5
  5221   5218   $as_echo "enabled $tcl_ok debugging" >&6; }
  5222   5219   	fi
  5223   5220       fi
  5224   5221   
  5225   5222   
  5226         -TCL_DBGX=${DBGX}
  5227         -
  5228   5223   #--------------------------------------------------------------------
  5229   5224   # Embed the manifest if we can determine how
  5230   5225   #--------------------------------------------------------------------
  5231   5226   
  5232   5227   
  5233   5228       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to embed manifest" >&5
  5234   5229   $as_echo_n "checking whether to embed manifest... " >&6; }
................................................................................
  5324   5319   
  5325   5320   #--------------------------------------------------------------------
  5326   5321   # Adjust the defines for how the resources are built depending
  5327   5322   # on symbols and static vs. shared.
  5328   5323   #--------------------------------------------------------------------
  5329   5324   
  5330   5325   if test ${SHARED_BUILD} = 0 ; then
  5331         -    if test "${DBGX}" = "g"; then
  5332         -        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
  5333         -    else
  5334         -        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
  5335         -    fi
         5326  +    RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
  5336   5327   else
  5337         -    if test "${DBGX}" = "g"; then
  5338         -        RC_DEFINES="${RC_DEFINE} DEBUG"
  5339         -    else
  5340         -        RC_DEFINES=""
  5341         -    fi
         5328  +    RC_DEFINES=""
  5342   5329   fi
  5343   5330   
  5344   5331   #--------------------------------------------------------------------
  5345   5332   #	The statements below define the symbol TCL_PACKAGE_PATH, which
  5346   5333   #	gives a list of directories that may contain packages.  The list
  5347   5334   #	consists of one directory for machine-dependent binaries and
  5348   5335   #	another for platform-independent scripts.
................................................................................
  5377   5364   
  5378   5365   
  5379   5366   
  5380   5367   
  5381   5368   
  5382   5369   
  5383   5370   # empty on win
  5384         -
  5385   5371   
  5386   5372   
  5387   5373   
  5388   5374   
  5389   5375   
  5390   5376   
  5391   5377   

Changes to win/configure.ac.

   328    328   # Set the default compiler switches based on the --enable-symbols
   329    329   # option.  This macro depends on C flags, and should be called
   330    330   # after SC_CONFIG_CFLAGS macro is called.
   331    331   #--------------------------------------------------------------------
   332    332   
   333    333   SC_ENABLE_SYMBOLS
   334    334   
   335         -TCL_DBGX=${DBGX}
   336         -
   337    335   #--------------------------------------------------------------------
   338    336   # Embed the manifest if we can determine how
   339    337   #--------------------------------------------------------------------
   340    338   
   341    339   SC_EMBED_MANIFEST
   342    340   
   343    341   #------------------------------------------------------------------------
................................................................................
   384    382   
   385    383   #--------------------------------------------------------------------
   386    384   # Adjust the defines for how the resources are built depending
   387    385   # on symbols and static vs. shared.
   388    386   #--------------------------------------------------------------------
   389    387   
   390    388   if test ${SHARED_BUILD} = 0 ; then
   391         -    if test "${DBGX}" = "g"; then
   392         -        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
   393         -    else
   394         -        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
   395         -    fi
          389  +    RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
   396    390   else
   397         -    if test "${DBGX}" = "g"; then
   398         -        RC_DEFINES="${RC_DEFINE} DEBUG"
   399         -    else
   400         -        RC_DEFINES=""
   401         -    fi
          391  +    RC_DEFINES=""
   402    392   fi
   403    393   
   404    394   #--------------------------------------------------------------------
   405    395   #	The statements below define the symbol TCL_PACKAGE_PATH, which
   406    396   #	gives a list of directories that may contain packages.  The list
   407    397   #	consists of one directory for machine-dependent binaries and
   408    398   #	another for platform-independent scripts.
................................................................................
   449    439   AC_SUBST(TCL_INCLUDE_SPEC)
   450    440   AC_SUBST(TCL_BUILD_STUB_LIB_SPEC)
   451    441   AC_SUBST(TCL_BUILD_STUB_LIB_PATH)
   452    442   AC_SUBST(TCL_DLL_FILE)
   453    443   
   454    444   AC_SUBST(TCL_SRC_DIR)
   455    445   AC_SUBST(TCL_BIN_DIR)
   456         -AC_SUBST(TCL_DBGX)
   457    446   AC_SUBST(CFG_TCL_SHARED_LIB_SUFFIX)
   458    447   AC_SUBST(CFG_TCL_UNSHARED_LIB_SUFFIX)
   459    448   AC_SUBST(CFG_TCL_EXPORT_FILE_SUFFIX)
   460    449   
   461    450   # win/tcl.m4 doesn't set (CFLAGS)
   462    451   AC_SUBST(CFLAGS_DEFAULT)
   463    452   AC_SUBST(EXTRA_CFLAGS)

Changes to win/makefile.vc.

   684    684   @[email protected]    $(TCL_PATCH_LEVEL)
   685    685   @[email protected]                 $(CC)
   686    686   @[email protected]               $(pkgcflags)
   687    687   @[email protected]       -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MDd
   688    688   @[email protected]    -nologo -c -W3 -YX -Fp$(TMP_DIR)\ -MD
   689    689   @[email protected]      -nologo -machine:$(MACHINE) -debug -debugtype:cv
   690    690   @[email protected]   -nologo -machine:$(MACHINE) -release -opt:ref -opt:icf,3
   691         -@[email protected]           $(SUFX)
   692    691   @[email protected]       $(PROJECT)$(VERSION)$(SUFX).lib
   693    692   @[email protected]
   694    693   @[email protected]               $(baselibs) $(PRJ_LIBS)
   695    694   @[email protected]             $(_INSTALLDIR)
   696    695   @[email protected]        $(BIN_INSTALL_DIR)
   697    696   @[email protected]
   698    697   @[email protected]

Changes to win/rules.vc.

  1039   1039   !if "$(MACHINE)" != "IX86"
  1040   1040   BUILDDIRTOP =$(BUILDDIRTOP)_$(MACHINE)
  1041   1041   !endif
  1042   1042   !if $(VCVER) > 6
  1043   1043   BUILDDIRTOP =$(BUILDDIRTOP)_VC$(VCVER)
  1044   1044   !endif
  1045   1045   
  1046         -!if !$(DEBUG) || $(DEBUG) && $(UNCHECKED)
         1046  +!if !$(DEBUG) || $(TCL_VERSION) > 86 || $(DEBUG) && $(UNCHECKED)
  1047   1047   SUFX	    = $(SUFX:g=)
  1048   1048   !endif
  1049   1049   
  1050   1050   TMP_DIRFULL = .\$(BUILDDIRTOP)\$(PROJECT)_ThreadedDynamicStaticX
  1051   1051   
  1052   1052   !if !$(STATIC_BUILD)
  1053   1053   TMP_DIRFULL = $(TMP_DIRFULL:Static=)

Changes to win/tcl.m4.

   276    276   
   277    277       if test -f $TCL_BIN_DIR/Makefile ; then
   278    278           TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
   279    279           TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
   280    280           TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
   281    281       fi
   282    282   
   283         -    #
   284         -    # eval is required to do the TCL_DBGX substitution
   285         -    #
   286         -
   287         -    eval "TCL_ZIP_FILE=\"${TCL_ZIP_FILE}\""
   288         -    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
   289         -    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
   290         -    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
   291         -
   292    283       eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
   293    284       eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
   294    285       eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
   295    286   
   296    287       AC_SUBST(TCL_VERSION)
   297    288       AC_SUBST(TCL_BIN_DIR)
   298    289       AC_SUBST(TCL_SRC_DIR)
................................................................................
   406    397   #		--enable-symbols
   407    398   #
   408    399   #	Defines the following vars:
   409    400   #		CFLAGS_DEFAULT	Sets to $(CFLAGS_DEBUG) if true
   410    401   #				Sets to $(CFLAGS_OPTIMIZE) if false
   411    402   #		LDFLAGS_DEFAULT	Sets to $(LDFLAGS_DEBUG) if true
   412    403   #				Sets to $(LDFLAGS_OPTIMIZE) if false
   413         -#		DBGX		Debug library extension
   414    404   #
   415    405   #------------------------------------------------------------------------
   416    406   
   417    407   AC_DEFUN([SC_ENABLE_SYMBOLS], [
   418    408       AC_MSG_CHECKING([for build with symbols])
   419    409       AC_ARG_ENABLE(symbols, [  --enable-symbols        build with debugging symbols (default: off)],    [tcl_ok=$enableval], [tcl_ok=no])
   420    410   # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
   421    411       if test "$tcl_ok" = "no"; then
   422    412   	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
   423    413   	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
   424         -	DBGX=""
   425    414   	AC_DEFINE(NDEBUG, 1, [Is no debugging enabled?])
   426    415   	AC_MSG_RESULT([no])
   427    416   
   428    417   	AC_DEFINE(TCL_CFG_OPTIMIZED)
   429    418       else
   430    419   	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
   431    420   	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
   432         -	DBGX=g
   433    421   	if test "$tcl_ok" = "yes"; then
   434    422   	    AC_MSG_RESULT([yes (standard debugging)])
   435    423   	fi
   436    424       fi
   437    425       AC_SUBST(CFLAGS_DEFAULT)
   438    426       AC_SUBST(LDFLAGS_DEFAULT)
   439    427   
................................................................................
   647    635   	LIBPREFIX="lib"
   648    636   
   649    637   	if test "${SHARED_BUILD}" = "0" ; then
   650    638   	    # static
   651    639               AC_MSG_RESULT([using static flags])
   652    640   	    runtime=
   653    641   	    LIBRARIES="\${STATIC_LIBRARIES}"
   654         -	    EXESUFFIX="s\${DBGX}.exe"
          642  +	    EXESUFFIX="s.exe"
   655    643   	else
   656    644   	    # dynamic
   657    645               AC_MSG_RESULT([using shared flags])
   658    646   
   659    647   	    # ad-hoc check to see if CC supports -shared.
   660    648   	    if "${CC}" -shared 2>&1 | egrep ': -shared not supported' >/dev/null; then
   661    649   		AC_MSG_ERROR([${CC} does not support the -shared option.
   662    650                   You will need to upgrade to a newer version of the toolchain.])
   663    651   	    fi
   664    652   
   665    653   	    runtime=
   666    654   	    # Add SHLIB_LD_LIBS to the Make rule, not here.
   667    655   
   668         -	    EXESUFFIX="\${DBGX}.exe"
          656  +	    EXESUFFIX=".exe"
   669    657   	    LIBRARIES="\${SHARED_LIBRARIES}"
   670    658   	fi
   671    659   	# Link with gcc since ld does not link to default libs like
   672    660   	# -luser32 and -lmsvcrt by default.
   673    661   	SHLIB_LD='${CC} -shared'
   674    662   	SHLIB_LD_LIBS='${LIBS}'
   675    663   	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -o \[$]@ ${extra_ldflags} \
   676    664   	    -Wl,--out-implib,\$(patsubst %.dll,lib%.a,\[$]@)"
   677    665   	# DLLSUFFIX is separate because it is the building block for
   678    666   	# users of tclConfig.sh that may build shared or static.
   679         -	DLLSUFFIX="\${DBGX}.dll"
   680         -	LIBSUFFIX="\${DBGX}.a"
   681         -	LIBFLAGSUFFIX="\${DBGX}"
          667  +	DLLSUFFIX=".dll"
          668  +	LIBSUFFIX=".a"
          669  +	LIBFLAGSUFFIX=""
   682    670   	SHLIB_SUFFIX=.dll
   683    671   
   684    672   	EXTRA_CFLAGS="${extra_cflags}"
   685    673   
   686    674   	CFLAGS_DEBUG=-g
   687    675   	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
   688    676   	CFLAGS_WARNING="-Wall -Wextra -Wwrite-strings -Wpointer-arith"
................................................................................
   746    734   	esac
   747    735       else
   748    736   	if test "${SHARED_BUILD}" = "0" ; then
   749    737   	    # static
   750    738               AC_MSG_RESULT([using static flags])
   751    739   	    runtime=-MT
   752    740   	    LIBRARIES="\${STATIC_LIBRARIES}"
   753         -	    EXESUFFIX="s\${DBGX}.exe"
          741  +	    EXESUFFIX="s.exe"
   754    742   	else
   755    743   	    # dynamic
   756    744               AC_MSG_RESULT([using shared flags])
   757    745   	    runtime=-MD
   758    746   	    # Add SHLIB_LD_LIBS to the Make rule, not here.
   759    747   	    LIBRARIES="\${SHARED_LIBRARIES}"
   760         -	    EXESUFFIX="\${DBGX}.exe"
          748  +	    EXESUFFIX=".exe"
   761    749   	    case "x`echo \${VisualStudioVersion}`" in
   762    750   		x1[[4-9]]*)
   763    751   		    lflags="${lflags} -nodefaultlib:libucrt.lib"
   764    752   		    ;;
   765    753   		*)
   766    754   		    ;;
   767    755   	    esac
   768    756   	fi
   769    757   	MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\[$]@"
   770    758   	# DLLSUFFIX is separate because it is the building block for
   771    759   	# users of tclConfig.sh that may build shared or static.
   772         -	DLLSUFFIX="\${DBGX}.dll"
   773         -	LIBSUFFIX="\${DBGX}.lib"
   774         -	LIBFLAGSUFFIX="\${DBGX}"
          760  +	DLLSUFFIX=".dll"
          761  +	LIBSUFFIX=".lib"
          762  +	LIBFLAGSUFFIX=""
   775    763   
   776    764   	if test "$do64bit" != "no" ; then
   777    765   	    case "$do64bit" in
   778    766   		amd64|x64|yes)
   779    767   		    MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
   780    768   		    ;;
   781    769   		ia64)
................................................................................
  1065   1053   # Results
  1066   1054   #	Subst's the following values:
  1067   1055   #		BUILD_TCLSH
  1068   1056   #------------------------------------------------------------------------
  1069   1057   
  1070   1058   AC_DEFUN([SC_BUILD_TCLSH], [
  1071   1059       AC_MSG_CHECKING([for tclsh in Tcl build directory])
  1072         -    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
         1060  +    BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${EXEEXT}
  1073   1061       AC_MSG_RESULT($BUILD_TCLSH)
  1074   1062       AC_SUBST(BUILD_TCLSH)
  1075   1063   ])
  1076   1064   
  1077   1065   #--------------------------------------------------------------------
  1078   1066   # SC_TCL_CFG_ENCODING	TIP #59
  1079   1067   #

Changes to win/tclConfig.sh.in.

    19     19   
    20     20   # C compiler to use for compilation.
    21     21   TCL_CC='@[email protected]'
    22     22   
    23     23   # -D flags for use with the C compiler.
    24     24   TCL_DEFS='@[email protected]'
    25     25   
    26         -# If TCL was built with debugging symbols, generated libraries contain
    27         -# this string at the end of the library name (before the extension).
    28         -[email protected][email protected]
           26  +# TCL_DBGX used to be used to distinguish debug vs. non-debug builds.
           27  +# This was a righteous pain so the core doesn't do that any more.
           28  +# DEPRECATED, will be removed in Tcl 9!
           29  +TCL_DBGX=''
    29     30   
    30     31   # Default flags used in an optimized and debuggable build, respectively.
    31     32   TCL_CFLAGS_DEBUG='@[email protected]'
    32     33   TCL_CFLAGS_OPTIMIZE='@[email protected]'
    33     34   
    34     35   # Default linker flags used in an optimized and debuggable build, respectively.
    35     36   TCL_LDFLAGS_DEBUG='@[email protected]'