Simplify usage of some linker options in the MSVC makefile.

FossilOrigin-Name: 03016020664a7459cb01c8ac9016b20af8a416bb

diff --git a/Makefile.msc b/Makefile.msc
index 5d961bffcdf7f6278cc03e3b5f54b872960eeca2..c5feb9d0edc79ed721f1feadfd9e8516971e1822 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -50,6 +50,14 @@ DEBUG = 0
 CC = cl.exe
 !ENDIF
 
+# Check for the command macro LD.  This should point to the linker binary for
+# the target platform.  If it does not exist, simply define it to the legacy
+# default value 'link.exe'.
+#
+!IFNDEF LD
+LD = link.exe
+!ENDIF
+
 # Check for the command macro NCC.  This should point to the compiler binary
 # for the platform the compilation process is taking place on.  If it does not
 # exist, simply define it to have the same value as the CC macro.  When
@@ -292,8 +300,7 @@ LTLINKOPTS = $(LTLINKOPTS) /APPCONTAINER
 
 # If either debugging or symbols are enabled, enable PDBs.
 !IF $(DEBUG)>0 || $(SYMBOLS)!=0
-LTLINKOPTS = $(LTLINKOPTS) /DEBUG
-BCC = $(BCC) /DEBUG
+LDFLAGS = /DEBUG
 !ENDIF
 
 # Start with the Tcl related linker options.
@@ -933,7 +940,7 @@ sqlite3.h:  $(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
        $(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP) > sqlite3.h
 
 mkkeywordhash.exe:     $(TOP)\tool\mkkeywordhash.c
-       $(BCC) -Femkkeywordhash.exe $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)\tool\mkkeywordhash.c
+       $(BCC) -Fe$@ $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)\tool\mkkeywordhash.c
 
 keywordhash.h: $(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
        .\mkkeywordhash.exe > keywordhash.h
@@ -1078,4 +1085,4 @@ sqlite3.def: libsqlite3.lib
                | sort >> sqlite3.def
 
 sqlite3.dll: $(LIBOBJ) sqlite3.def
-       link $(LTLINKOPTS) $(LTLIBPATHS) /DLL /DEF:sqlite3.def /OUT:$@ $(LIBOBJ) $(LTLIBS) $(TLIBS)
+       $(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /DEF:sqlite3.def /OUT:$@ $(LIBOBJ) $(LTLIBS) $(TLIBS)

diff --git a/manifest b/manifest
index ead73d4c619fd6cc192ce41397dabcbfc5af363f..248fe642c4c94f98cc1fdeaf16ebb57ca8b75430 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Make\suse\sof\sthe\spredefined\snmake\scommand\smacro\sCC\swhen\spossible\sinstead\sof\sthe\sliteral\sstring\s'cl.exe'.\s\sImprove\ssupport\sfor\scross-compilation.\s\sEliminate\sproblematic\suse\sof\sdouble\squotes\sin\smacro\spreprocessing\sexpressions.
-D 2012-06-30T16:22:05.485
+C Simplify\susage\sof\ssome\slinker\soptions\sin\sthe\sMSVC\smakefile.
+D 2012-06-30T19:24:09.458
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc d5fe268f23e35af9a6b8c6c7df983dda65f0a017
+F Makefile.msc 04ebadf5e94d566d4ef9f636416f68e17205120f
 F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION a71848df48082f1d6585d4b0819d530fc455485d
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 3b4f5add04259eec145066312bcd532182cc339c
-R 437136894c0f887fea4db99bcef8bbec
+P 6c88229aa39775a7438befebe1640a30affc72c8
+R 0706037ca6af4d59d9bcb1545687aa13
 U mistachkin
-Z e6de48dad2c2672c700a9587a09ef1b4
+Z 4412848c1478fd90700fa3f54861d772

diff --git a/manifest.uuid b/manifest.uuid
index 486e7319bb0f361f93fa7d7f64498fb710b22aba..c2ca55333568ebd815a0a07387901fa15c194400 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6c88229aa39775a7438befebe1640a30affc72c8
\ No newline at end of file
+03016020664a7459cb01c8ac9016b20af8a416bb
\ No newline at end of file