suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed broken mats on Windows caused by Bash/WSL changes

Browse Source 
original commit: 996ba3897f1c4ea27b4b6a15264dc6f6a14c6cdb
This commit is contained in:
Bob Burger 2017-08-03 11:51:16 -04:00
parent f09043b073
commit 7ba018bd41
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LOG
View File

@ -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

6
mats/7.ms
View File

@ -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))

6
mats/ftype.ms
View File

@ -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...