Fossil SCM

Remove FOSSIL_DYNAMIC_BUILD define from MinGW as not _all_ libraries are linked dynamically (i.e. only the MSVCRT, which we have no control over).

mistachkin 2015-06-17 17:03 UTC dynamicMsvc
Commit f5f81a2a583bd45a1b719436dfa7f55bf7dffb52
Parent 5d48958e578a5c5…
3 files changed +8 -7 +8 -7 +8 -7
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M src/makemake.tcl
+8 -7
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -745,17 +745,18 @@
745745
 ifdef FOSSIL_ENABLE_JSON
746746
 TCC += -DFOSSIL_ENABLE_JSON=1
747747
 RCC += -DFOSSIL_ENABLE_JSON=1
748748
 endif
749749
750
-#### The option -static has no effect on mingw(-w64), only
751
-# dynamic executables can be built linking with msvcrt.dll.
752
-# Openssl (optional) and zlib however are always linked in
753
-# statically.
754
-#LIB = -static
755
-TCC += -DFOSSIL_DYNAMIC_BUILD=1
756
-RCC += -DFOSSIL_DYNAMIC_BUILD=1
750
+#### The option -static has no effect on MinGW(-w64), only dynamic
751
+# executables can be built when linking with MSVCRT. OpenSSL
752
+# (optional) and zlib (required) however are always linked in
753
+# statically. Therefore, the FOSSIL_DYNAMIC_BUILD option does
754
+# not really apply to MinGW (i.e. since ALL external libraries
755
+# are NOT linked dynamically).
756
+#
757
+# LIB = -static
757758
758759
 #### MinGW: If available, use the Unicode capable runtime startup code.
759760
 #
760761
 ifndef MINGW_IS_32BIT_ONLY
761762
 LIB += -municode
762763
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -745,17 +745,18 @@
745 ifdef FOSSIL_ENABLE_JSON
746 TCC += -DFOSSIL_ENABLE_JSON=1
747 RCC += -DFOSSIL_ENABLE_JSON=1
748 endif
749
750 #### The option -static has no effect on mingw(-w64), only
751 # dynamic executables can be built linking with msvcrt.dll.
752 # Openssl (optional) and zlib however are always linked in
753 # statically.
754 #LIB = -static
755 TCC += -DFOSSIL_DYNAMIC_BUILD=1
756 RCC += -DFOSSIL_DYNAMIC_BUILD=1
 
757
758 #### MinGW: If available, use the Unicode capable runtime startup code.
759 #
760 ifndef MINGW_IS_32BIT_ONLY
761 LIB += -municode
762
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -745,17 +745,18 @@
745 ifdef FOSSIL_ENABLE_JSON
746 TCC += -DFOSSIL_ENABLE_JSON=1
747 RCC += -DFOSSIL_ENABLE_JSON=1
748 endif
749
750 #### The option -static has no effect on MinGW(-w64), only dynamic
751 # executables can be built when linking with MSVCRT. OpenSSL
752 # (optional) and zlib (required) however are always linked in
753 # statically. Therefore, the FOSSIL_DYNAMIC_BUILD option does
754 # not really apply to MinGW (i.e. since ALL external libraries
755 # are NOT linked dynamically).
756 #
757 # LIB = -static
758
759 #### MinGW: If available, use the Unicode capable runtime startup code.
760 #
761 ifndef MINGW_IS_32BIT_ONLY
762 LIB += -municode
763
M win/Makefile.mingw
+8 -7
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -298,17 +298,18 @@
298298
 ifdef FOSSIL_ENABLE_JSON
299299
 TCC += -DFOSSIL_ENABLE_JSON=1
300300
 RCC += -DFOSSIL_ENABLE_JSON=1
301301
 endif
302302
303
-#### The option -static has no effect on mingw(-w64), only
304
-# dynamic executables can be built linking with msvcrt.dll.
305
-# Openssl (optional) and zlib however are always linked in
306
-# statically.
307
-#LIB = -static
308
-TCC += -DFOSSIL_DYNAMIC_BUILD=1
309
-RCC += -DFOSSIL_DYNAMIC_BUILD=1
303
+#### The option -static has no effect on MinGW(-w64), only dynamic
304
+# executables can be built when linking with MSVCRT. OpenSSL
305
+# (optional) and zlib (required) however are always linked in
306
+# statically. Therefore, the FOSSIL_DYNAMIC_BUILD option does
307
+# not really apply to MinGW (i.e. since ALL external libraries
308
+# are NOT linked dynamically).
309
+#
310
+# LIB = -static
310311
311312
 #### MinGW: If available, use the Unicode capable runtime startup code.
312313
 #
313314
 ifndef MINGW_IS_32BIT_ONLY
314315
 LIB += -municode
315316
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -298,17 +298,18 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### The option -static has no effect on mingw(-w64), only
304 # dynamic executables can be built linking with msvcrt.dll.
305 # Openssl (optional) and zlib however are always linked in
306 # statically.
307 #LIB = -static
308 TCC += -DFOSSIL_DYNAMIC_BUILD=1
309 RCC += -DFOSSIL_DYNAMIC_BUILD=1
 
310
311 #### MinGW: If available, use the Unicode capable runtime startup code.
312 #
313 ifndef MINGW_IS_32BIT_ONLY
314 LIB += -municode
315
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -298,17 +298,18 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### The option -static has no effect on MinGW(-w64), only dynamic
304 # executables can be built when linking with MSVCRT. OpenSSL
305 # (optional) and zlib (required) however are always linked in
306 # statically. Therefore, the FOSSIL_DYNAMIC_BUILD option does
307 # not really apply to MinGW (i.e. since ALL external libraries
308 # are NOT linked dynamically).
309 #
310 # LIB = -static
311
312 #### MinGW: If available, use the Unicode capable runtime startup code.
313 #
314 ifndef MINGW_IS_32BIT_ONLY
315 LIB += -municode
316
M win/Makefile.mingw.mistachkin
+8 -7
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -298,17 +298,18 @@
298298
 ifdef FOSSIL_ENABLE_JSON
299299
 TCC += -DFOSSIL_ENABLE_JSON=1
300300
 RCC += -DFOSSIL_ENABLE_JSON=1
301301
 endif
302302
303
-#### The option -static has no effect on mingw(-w64), only
304
-# dynamic executables can be built linking with msvcrt.dll.
305
-# Openssl (optional) and zlib however are always linked in
306
-# statically.
307
-#LIB = -static
308
-TCC += -DFOSSIL_DYNAMIC_BUILD=1
309
-RCC += -DFOSSIL_DYNAMIC_BUILD=1
303
+#### The option -static has no effect on MinGW(-w64), only dynamic
304
+# executables can be built when linking with MSVCRT. OpenSSL
305
+# (optional) and zlib (required) however are always linked in
306
+# statically. Therefore, the FOSSIL_DYNAMIC_BUILD option does
307
+# not really apply to MinGW (i.e. since ALL external libraries
308
+# are NOT linked dynamically).
309
+#
310
+# LIB = -static
310311
311312
 #### MinGW: If available, use the Unicode capable runtime startup code.
312313
 #
313314
 ifndef MINGW_IS_32BIT_ONLY
314315
 LIB += -municode
315316
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -298,17 +298,18 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### The option -static has no effect on mingw(-w64), only
304 # dynamic executables can be built linking with msvcrt.dll.
305 # Openssl (optional) and zlib however are always linked in
306 # statically.
307 #LIB = -static
308 TCC += -DFOSSIL_DYNAMIC_BUILD=1
309 RCC += -DFOSSIL_DYNAMIC_BUILD=1
 
310
311 #### MinGW: If available, use the Unicode capable runtime startup code.
312 #
313 ifndef MINGW_IS_32BIT_ONLY
314 LIB += -municode
315
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -298,17 +298,18 @@
298 ifdef FOSSIL_ENABLE_JSON
299 TCC += -DFOSSIL_ENABLE_JSON=1
300 RCC += -DFOSSIL_ENABLE_JSON=1
301 endif
302
303 #### The option -static has no effect on MinGW(-w64), only dynamic
304 # executables can be built when linking with MSVCRT. OpenSSL
305 # (optional) and zlib (required) however are always linked in
306 # statically. Therefore, the FOSSIL_DYNAMIC_BUILD option does
307 # not really apply to MinGW (i.e. since ALL external libraries
308 # are NOT linked dynamically).
309 #
310 # LIB = -static
311
312 #### MinGW: If available, use the Unicode capable runtime startup code.
313 #
314 ifndef MINGW_IS_32BIT_ONLY
315 LIB += -municode
316

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button