From 1ce6d6bf31868819806018a6878c8a4ef0aca4fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Wed, 12 Feb 2020 00:36:54 +0100
Subject: [PATCH] fix Azure Pipelines 64-bit build

---
 azure-pipelines.yml        | 2 +-
 nim.cfg                    | 7 ++++---
 vendor/nimbus-build-system | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7bbf88165..1fc333cf7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -69,7 +69,7 @@ jobs:
           git config --global core.autocrlf false
           git submodule --quiet update --init --recursive
           scripts/setup_official_tests.sh jsonTestsCache
-          mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries V=1 update
+          mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} CI_CACHE=NimBinaries update
           mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} fetch-dlls
           mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} P2PD_CACHE=p2pdCache
           mingw32-make -j2 ARCH_OVERRIDE=${PLATFORM} P2PD_CACHE=p2pdCache NIMFLAGS="-d:NETWORK_TYPE=libp2p -d:testnet_servers_image"
diff --git a/nim.cfg b/nim.cfg
index 04e640745..efd5151a2 100644
--- a/nim.cfg
+++ b/nim.cfg
@@ -14,9 +14,6 @@
   @if i386:
     # set the IMAGE_FILE_LARGE_ADDRESS_AWARE flag so we can use PAE, if enabled, and access more than 2 GiB of RAM
     --passL:"-Wl,--large-address-aware"
-  @else
-    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65782
-    --passC:"-fno-asynchronous-unwind-tables"
   @end
 
   # The dynamic Chronicles output currently prevents us from using colors on Windows
@@ -33,6 +30,10 @@
   --passC:"-msse3"
 @else:
   --passC:"-march=native"
+  @if windows:
+    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65782
+    --passC:"-fno-asynchronous-unwind-tables"
+  @end
 @end
 
 --threads:on
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index acfe8c4bf..2c4faa537 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit acfe8c4bfe603a40e191c950aef1bfe149dbc623
+Subproject commit 2c4faa5372d2d8b0c2d16710fe5f93beab1c86af