From 5ed8bd0689649f985ff1b89a63f064c078adc6a6 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 12 Apr 2018 10:18:48 +0200
Subject: [PATCH 11/23] detect architecture

---
 configure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.py b/configure.py
index 5a242a1a..9950626e 100755
--- a/configure.py
+++ b/configure.py
@@ -955,7 +955,7 @@ def configure_node(o):
   o['variables']['node_report'] = b(not options.without_report)
   o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
-  host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()
+  host_arch = host_arch_win() if (os.name == 'nt' and not ('GCC' in sys.version)) else host_arch_cc()
   target_arch = options.dest_cpu or host_arch
   # ia32 is preferred by the build tools (GYP) over x86 even if we prefer the latter
   # the Makefile resets this to x86 afterward
-- 
2.17.0.windows.1