From d973a3dfd2fa39c14a1995e4a6d59bb08e88f37b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 27 Aug 2019 09:59:34 +0200
Subject: Change bootstrap target on Windows from i686 to x86_64

Seeing that we have dropped 32-bit baseutils, this feels like the correct
default.
---
 bootstrap-mingw.bat | 2 +-
 bootstrap-msvc.bat  | 2 +-
 bootstrap.gmake     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap-mingw.bat b/bootstrap-mingw.bat
index e4caf8e..46eb0a4 100644
--- a/bootstrap-mingw.bat
+++ b/bootstrap-mingw.bat
@@ -106,7 +106,7 @@ for %%d in (%src%) do (
 )
 
 echo on
-%cxx% -I%libbutl% -I. -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"i686-w64-mingw32\" %ops% -o build2\b-boot.exe %r% -limagehlp
+%cxx% -I%libbutl% -I. -DBUILD2_BOOTSTRAP -DBUILD2_HOST_TRIPLET=\"x86_64-w64-mingw32\" %ops% -o build2\b-boot.exe %r% -limagehlp
 @echo off
 if errorlevel 1 goto error
 
diff --git a/bootstrap-msvc.bat b/bootstrap-msvc.bat
index 1facca5..9fed752 100644
--- a/bootstrap-msvc.bat
+++ b/bootstrap-msvc.bat
@@ -40,7 +40,7 @@ goto :eof
   rem Note that echo does not override errorlevel.
   rem
   echo on
-  %cxx% /I%owd%\%libbutl% /I%owd% /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /DBUILD2_BOOTSTRAP /DBUILD2_HOST_TRIPLET=\"i686-microsoft-win32-msvc\" %ops% /c /TP %*
+  %cxx% /I%owd%\%libbutl% /I%owd% /D_CRT_SECURE_NO_WARNINGS /D_SCL_SECURE_NO_WARNINGS /DBUILD2_BOOTSTRAP /DBUILD2_HOST_TRIPLET=\"x86_64-microsoft-win32-msvc\" %ops% /c /TP %*
   @echo off
   if errorlevel 1 exit /b 1
 goto :eof
diff --git a/bootstrap.gmake b/bootstrap.gmake
index e4d4b33..6a2ca69 100644
--- a/bootstrap.gmake
+++ b/bootstrap.gmake
@@ -39,8 +39,8 @@ chost :=
 
 ifeq ($(OS),Windows_NT)
   exe   := .exe
-  host  := i686-w64-mingw32
-  chost := i686-w64-mingw32
+  host  := x86_64-w64-mingw32
+  chost := x86_64-w64-mingw32
   override LIBS += -limagehlp
 else
   override LIBS += -lpthread
-- 
cgit v1.1