From 351157c0e3d47d0bc7e427af06b63c84f7a9ea0d Mon Sep 17 00:00:00 2001
From: SANO Masatoshi <snmsts@gmail.com>
Date: Mon, 7 Jun 2021 13:10:33 +0900
Subject: [PATCH] improve uname for windows

---
 scripts/install-for-ci.sh | 4 +++-
 src/util_windows.c        | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/install-for-ci.sh b/scripts/install-for-ci.sh
index b20b896..63c4c24 100644
--- a/scripts/install-for-ci.sh
+++ b/scripts/install-for-ci.sh
@@ -203,7 +203,9 @@ install_roswell () {
     fi
 }
 
-install_sbcl_bin () {}
+install_sbcl_bin () {
+    true
+}
 
 install_lisp_dependency () {
     case "$USE_LISP" in
diff --git a/src/util_windows.c b/src/util_windows.c
index 1b76cda..5f746eb 100644
--- a/src/util_windows.c
+++ b/src/util_windows.c
@@ -18,6 +18,11 @@ char* uname_s(void) {
 }
 
 char* uname_m(void) {
+  char* carch=getenv("MSYSTEM_CARCH");
+  if(carch && strcmp(carch,"x86_64")==0)
+    return q("x86-64");
+  if(carch && strcmp(carch,"i686")==0)
+    return q("x86");
   char* msystem=getenv("MSYSTEM");
   if(msystem && strcmp(msystem,"MINGW64")==0)
     return q("x86-64");