From 807aaa46b1b26a459ac1ce44c17dbe872ad0b637 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Thu, 15 Oct 2020 18:45:39 -0400
Subject: [PATCH] More reliable Windows wordsize detection

---
 config-mingw | 2 +-
 config-msvc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config-mingw b/config-mingw
index 0d630101..4dfe2cf2 100755
--- a/config-mingw
+++ b/config-mingw
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 set -x
-if echo $PATH | grep -q /mingw64; then
+if g++ -v 2>&1 | grep Target: | grep -q x86_64; then
     wordsize=64
 else
     wordsize=32
diff --git a/config-msvc b/config-msvc
index 56d752e4..36c4aab2 100755
--- a/config-msvc
+++ b/config-msvc
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 set -x
-if echo $PATH | grep -q /mingw64; then
+if cl 2>&1 | grep -q 'for x64'; then
     wordsize=64
 else
     wordsize=32