Attempt to detect when the MSVC linker requires the /MACHINE argument.

FossilOrigin-Name: 3e355846217785c30f518d31a5541172c4213c0d8559c3f8638a047cd745c98e

diff --git a/Makefile.msc b/Makefile.msc
index ab7c9b9c54ec54021fd67fc51f5ff14513c52765..47e7ccc2c73cfcbdcec3df88e90d904f4ef0f624 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1089,9 +1089,19 @@ LTLIBS = $(LTLIBS) rpcrt4.lib
 LTLINKOPTS = /NOLOGO /MACHINE:$(PLATFORM)
 LTLIBOPTS = /NOLOGO /MACHINE:$(PLATFORM)
 !ELSE
+!IFDEF VISUALSTUDIOVERSION
+!IF "$(VISUALSTUDIOVERSION)">="12.0"
+LTLINKOPTS = /NOLOGO /MACHINE:x86
+LTLIBOPTS = /NOLOGO /MACHINE:x86
+!ELSE
+LTLINKOPTS = /NOLOGO
+LTLIBOPTS = /NOLOGO
+!ENDIF
+!ELSE
 LTLINKOPTS = /NOLOGO
 LTLIBOPTS = /NOLOGO
 !ENDIF
+!ENDIF
 
 # When compiling for use in the WinRT environment, the following
 # linker option must be used to mark the executable as runnable

diff --git a/manifest b/manifest
index 2d68d057e158676bd549e2a8efd442a6800f78b9..484a69fbc90187ca4a6243b612eb62edb496d46d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Sync\sup\sthe\sautoconf\smakefile\sfor\sMSVC.
-D 2019-03-22T01:26:39.151
+C Attempt\sto\sdetect\swhen\sthe\sMSVC\slinker\srequires\sthe\s/MACHINE\sargument.
+D 2019-03-22T16:52:17.298
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 236d2739dc3e823c3c909bca2d6cef93009bafbefd7018a8f3281074ecb92954
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 3316c2167678383ee52ae9eb4fbb2c307904000c1a39184b1f418fc935ab0f48
+F Makefile.msc dd141c2646a46b10ccfed9a7a1613dbf206af0dcac0c3b91ffb5cbaa5deb2cfc
 F README.md ebcdb6d5656020ef5ca37a6fc1ad89b4c80560ea33a3d70c250f9b845cf9da62
 F VERSION 288d756b1b7be03ecdbf1795c23af2c8425f2e46ba6979a14ef53360308f080d
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1807,7 +1807,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 908c4c891fa7472b43d232bde7d3789105c5f5b2cfaf6652bf6d5829236933cf
-R 457ef153bac61328fd4ef7e64d2104a9
+P ecbae90aef63ed6d07d474416900db36ff6dd9c2ed1bbb5f4d883b6838156be1
+R 6760bb8a25a16330268b7b4bc7253c8b
 U mistachkin
-Z ce507797ad6f43c2bc842bad36dd2bcf
+Z 223ac1a94817effaa94f71092252d26d

diff --git a/manifest.uuid b/manifest.uuid
index 6ec39656f134c18d564a67d4d42bcc0a160758f8..b41b27b5ff07f5a0f22898c99c7d0863abffe8b7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ecbae90aef63ed6d07d474416900db36ff6dd9c2ed1bbb5f4d883b6838156be1
\ No newline at end of file
+3e355846217785c30f518d31a5541172c4213c0d8559c3f8638a047cd745c98e
\ No newline at end of file