From 7ba018bd41dc5b4f4cd8077424939d8a803c56c9 Mon Sep 17 00:00:00 2001
From: Bob Burger <rgburger@beckman.com>
Date: Thu, 3 Aug 2017 11:51:16 -0400
Subject: [PATCH] fixed broken mats on Windows caused by Bash/WSL changes

original commit: 996ba3897f1c4ea27b4b6a15264dc6f6a14c6cdb
---
 LOG           | 2 ++
 mats/7.ms     | 6 +++---
 mats/ftype.ms | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/LOG b/LOG
index aac6cf0fb8..b7596a66cc 100644
--- a/LOG
+++ b/LOG
@@ -554,3 +554,5 @@
     inspect.ss, primdata.ss, prims.ss, print.ss, cmacros.ss, types.ss,
     mat.ss, 8.ms, root-experr*,
     syntax.stex, debug.stex, system.stex, release_notes.stex
+- fixed broken mats on Windows caused by Bash/WSL changes
+    7.ms, ftype.ms
diff --git a/mats/7.ms b/mats/7.ms
index caef31a675..aa5b9eddb0 100644
--- a/mats/7.ms
+++ b/mats/7.ms
@@ -892,9 +892,9 @@
     "hello 1\nhello 2\nhello 3\nhello 4\nhello 5\n")
   (equal?
     (begin
-      (unless (or (embedded?) (equal? *scheme* (format "../bin/~a/scheme" (machine-type))))
-        (errorf #f "not testing boot file based on ../boot/~a/petite.boot, since *scheme* isn't ../bin/~a/scheme"
-          (machine-type) (machine-type)))
+      (unless (or (embedded?) (equal? *scheme* (format "../bin/~a/scheme~a" (machine-type) (if (windows?) ".exe" ""))))
+        (errorf #f "not testing boot file based on ../boot/~a/petite.boot, since *scheme* isn't ../bin/~a/scheme~a"
+          (machine-type) (machine-type) (if (windows?) ".exe" "")))
       (parameterize ([optimize-level 2])
         (make-boot-file "testfile.boot" '()
           (format "../boot/~a/petite.boot" (machine-type))
diff --git a/mats/ftype.ms b/mats/ftype.ms
index 26bb4b177b..1971d13513 100644
--- a/mats/ftype.ms
+++ b/mats/ftype.ms
@@ -556,8 +556,10 @@
                         (system (format "cc -m32 -dynamiclib -o ~a ~a" testfile.so testfile.c))]
                        [(a6osx a6osx)
                         (system (format "cc -m64 -dynamiclib -o ~a ~a" testfile.so testfile.c))]
-                       [(i3nt ti3nt a6nt ta6nt)
-                        (system (format "..\\c\\vs.bat cl /DWIN32 /Fe~a /LD /MD /nologo ~a" testfile.so testfile.c))]
+                       [(a6nt ta6nt)
+                        (system (format "..\\c\\vs.bat x86_amd64 amd64 && cl /DWIN32 /Fe~a /LD /MD /nologo ~a" testfile.so testfile.c))]
+                       [(i3nt ti3nt)
+                        (system (format "..\\c\\vs.bat x86 && cl /DWIN32 /Fe~a /LD /MD /nologo ~a" testfile.so testfile.c))]
                        [(arm32le tarm32le)
                         (system (format "cc -fPIC -shared -o ~a ~a" testfile.so testfile.c))]
                        [else ; this should work for most intel-based systems that use gcc...