Check-in [ac26e907d3]
Not logged in
Bounty program for improvements to Tcl and certain Tcl packages.
Tcl 2018 Conference, Houston/TX, US, Oct 15-19
Send your abstracts to tclconference@googlegroups.com or submit via the online form
by Aug 20.

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

Overview
Comment:Adding in the -static-libgcc to prevent a dependency on mingw dlls
Timelines: family | ancestors | descendants | both | autosetup
Files: files | file ages | folders
SHA1: ac26e907d3d4b55561742f9d6fa153dc8ba82574
User & Date: hypnotoad 2015-05-06 02:42:51
Context
2015-05-14
09:58
Bumping sqlite back down to 3.8.7.2 Closed-Leaf check-in: 6b5f67f98b user: hypnotoad tags: autosetup
2015-05-06
02:42
Adding in the -static-libgcc to prevent a dependency on mingw dlls check-in: ac26e907d3 user: hypnotoad tags: autosetup
2015-05-05
17:54
Make sherpa modified and simplified as a standalone script Sherpa and Kettle re-engineered to work direct from script check-in: ff0d449b72 user: hypnotoad tags: autosetup
Changes
Unified Diff Ignore Whitespace Patch
Changes to autosetup/cc-shared.tcl.
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
		define SH_SOEXTVER .%s.dylib
		define SH_SOPREFIX -Wl,-install_name,
		define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
		define STRIPLIBFLAGS -x
	}
	*-*-ming* - *-*-cygwin - *-*-msys {
		define SHOBJ_CFLAGS ""
		define SHOBJ_LDFLAGS -shared
		define SH_CFLAGS ""
		define SH_LDFLAGS -shared
		define SH_LINKFLAGS ""
		define SH_SOEXT .dll
		define SH_SOEXTVER .dll
		define SH_SOPREFIX ""
		define LD_LIBRARY_PATH PATH
	}
	sparc* {







|

|







47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
		define SH_SOEXTVER .%s.dylib
		define SH_SOPREFIX -Wl,-install_name,
		define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
		define STRIPLIBFLAGS -x
	}
	*-*-ming* - *-*-cygwin - *-*-msys {
		define SHOBJ_CFLAGS ""
		define SHOBJ_LDFLAGS "-shared -static-libgcc -static-libstd++"
		define SH_CFLAGS ""
		define SH_LDFLAGS "-shared -static-libgcc -static-libstd++"
		define SH_LINKFLAGS ""
		define SH_SOEXT .dll
		define SH_SOEXTVER .dll
		define SH_SOPREFIX ""
		define LD_LIBRARY_PATH PATH
	}
	sparc* {
Changes to autosetup/lib/cc-shared.tcl.
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
		define SH_SOEXTVER .%s.dylib
		define SH_SOPREFIX -Wl,-install_name,
		define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
		define STRIPLIBFLAGS -x
	}
	*-*-ming* - *-*-cygwin - *-*-msys {
		define SHOBJ_CFLAGS ""
		define SHOBJ_LDFLAGS -shared
		define SH_CFLAGS ""
		define SH_LDFLAGS -shared
		define SH_LINKFLAGS ""
		define SH_SOEXT .dll
		define SH_SOEXTVER .dll
		define SH_SOPREFIX ""
		define LD_LIBRARY_PATH PATH
	}
	sparc* {







|

|







47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
		define SH_SOEXTVER .%s.dylib
		define SH_SOPREFIX -Wl,-install_name,
		define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
		define STRIPLIBFLAGS -x
	}
	*-*-ming* - *-*-cygwin - *-*-msys {
		define SHOBJ_CFLAGS ""
		define SHOBJ_LDFLAGS "-shared -static-libgcc"
		define SH_CFLAGS ""
		define SH_LDFLAGS "-shared -static-libgcc"
		define SH_LINKFLAGS ""
		define SH_SOEXT .dll
		define SH_SOEXTVER .dll
		define SH_SOPREFIX ""
		define LD_LIBRARY_PATH PATH
	}
	sparc* {
Changes to autosetup/lib/odie.tcl.
291
292
293
294
295
296
297

298
299
300
301
302
303
304
305
306
307
308
309
310
311

312
313
314
315
316
317
318
set ::odie(os)  [exec uname -s]
set ::odie(system) ${::odie(os)}-${::odie(cpu)}

set vfscp {cp -a}
set ::odie(windows) 0
set ::odie(64bit) [expr {$::odie(cpu) in {amd64 x64 x86_64}}]
set ::odie(teacup_cpu) $::odie(cpu)

###
# Sort out some slight differences between Visual studio
# based builds and mingw/cygwin
###
switch -glob -- [get-define build] {
  *-*-ming* - *-*-cygwin - *-*-msys {
    ###
    # Under mingw, 64 bit is not possible
    ###
    set ::odie(windows) 1
    set ::odie(os) cygwin
    set ::odie(64bit) 0
    set ::odie(teacup_cpu) ix86
    set ::odie(teacup_os) win32

  }
  *win32* - *WIN32* {
    ###
    # With visual studio, 64 bit should be assumed
    # but is otherwise to taste
    ###
    set odie(windows) 1







>














>







291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
set ::odie(os)  [exec uname -s]
set ::odie(system) ${::odie(os)}-${::odie(cpu)}

set vfscp {cp -a}
set ::odie(windows) 0
set ::odie(64bit) [expr {$::odie(cpu) in {amd64 x64 x86_64}}]
set ::odie(teacup_cpu) $::odie(cpu)
set ::odie(ld_flags) {}
###
# Sort out some slight differences between Visual studio
# based builds and mingw/cygwin
###
switch -glob -- [get-define build] {
  *-*-ming* - *-*-cygwin - *-*-msys {
    ###
    # Under mingw, 64 bit is not possible
    ###
    set ::odie(windows) 1
    set ::odie(os) cygwin
    set ::odie(64bit) 0
    set ::odie(teacup_cpu) ix86
    set ::odie(teacup_os) win32
    set ::odie(ld_flags) "-static-libgcc -static-libstdc++"
  }
  *win32* - *WIN32* {
    ###
    # With visual studio, 64 bit should be assumed
    # but is otherwise to taste
    ###
    set odie(windows) 1
Changes to src/toadkit/Makefile.in.
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
	touch .empty
	zip null.zip .empty

tclkit_bare_OLD${EXE}: $(PKG_OBJECTS)
	echo Built against ${TCL_FULL_VERSION}
	echo KIT_LIBS $(KIT_LIBS)
	$(CC) $(strip \
		$(subst ', , $(CFLAGS) $(TCL_EXTRA_CFLAGS) $(DEFS) $(TCL_LD_FLAGS)) \
		$(PKG_OBJECTS) \
		${libdir}/${TCL_STUB_LIB_FILE} \
		${ODIE_STATIC_TCLLIB} \
		$(subst ', , $(KIT_LIBS) $(TCL_LIBS) $(TCL_CC_SEARCH_FLAGS)) \
		$(TOADKIT_EXTRA_OBJS) \
		-o tclkit_bare${EXE})

tclkit_bare${EXE}: $(PKG_OBJECTS)
	echo Built against ${TCL_FULL_VERSION}
	echo KIT_LIBS $(KIT_LIBS)
	$(CC) $(strip \
		$(subst ', , $(CFLAGS) $(TCL_EXTRA_CFLAGS) $(TCL_LD_FLAGS)) \
		$(PKG_OBJECTS) \
		${ODIE_STATIC_TCLLIB} \
		${libdir}/${TCL_STUB_LIB_FILE} \
		$(subst ', , $(KIT_LIBS) $(TCL_LIBS) $(TCL_CC_SEARCH_FLAGS)) \
		$(TOADKIT_EXTRA_OBJS) \
		-o tclkit_bare${EXE})








|











|







82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
	touch .empty
	zip null.zip .empty

tclkit_bare_OLD${EXE}: $(PKG_OBJECTS)
	echo Built against ${TCL_FULL_VERSION}
	echo KIT_LIBS $(KIT_LIBS)
	$(CC) $(strip \
		$(subst ', , $(CFLAGS) $(TCL_EXTRA_CFLAGS) $(DEFS) $(TCL_LD_FLAGS) $(ODIE_LD_FLAGS)) \
		$(PKG_OBJECTS) \
		${libdir}/${TCL_STUB_LIB_FILE} \
		${ODIE_STATIC_TCLLIB} \
		$(subst ', , $(KIT_LIBS) $(TCL_LIBS) $(TCL_CC_SEARCH_FLAGS)) \
		$(TOADKIT_EXTRA_OBJS) \
		-o tclkit_bare${EXE})

tclkit_bare${EXE}: $(PKG_OBJECTS)
	echo Built against ${TCL_FULL_VERSION}
	echo KIT_LIBS $(KIT_LIBS)
	$(CC) $(strip \
		$(subst ', , $(CFLAGS) $(TCL_EXTRA_CFLAGS) $(TCL_LD_FLAGS) $(ODIE_LD_FLAGS)) \
		$(PKG_OBJECTS) \
		${ODIE_STATIC_TCLLIB} \
		${libdir}/${TCL_STUB_LIB_FILE} \
		$(subst ', , $(KIT_LIBS) $(TCL_LIBS) $(TCL_CC_SEARCH_FLAGS)) \
		$(TOADKIT_EXTRA_OBJS) \
		-o tclkit_bare${EXE})