Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:fasterthanlime/rock

  • Loading branch information...
commit 4b656c97ddfb93658e22ccf99f16d9d99492cff3 2 parents ced4697 + e056ff0
@fasterthanlime authored
Showing with 2 additions and 2 deletions.
  1. +1 −1  Makefile
  2. +1 −1  source/rock/middle/Version.ooc
View
2  Makefile
@@ -98,7 +98,7 @@ download-bootstrap:
rm -rf build/
# Note: ./utils/downloader tries curl, ftp, and then wget.
# GNU ftp will _not_ work: it does not accept a url as an argument.
- ./utils/downloader.sh http://downloads.ooc-lang.org/rock/0.9.9/latest-bootstrap.tar.bz2 | tar xjmf - 1>/dev/null
+ ./utils/downloader.sh http://downloads.ooc-lang.org/rock/0.9.10/latest-bootstrap.tar.bz2 | tar xjmf - 1>/dev/null
if [ ! -e build ]; then cp -rfv rock-*/build ./; fi
# Attempt to grab a rock bootstrap from Alpaca and recompile
View
2  source/rock/middle/Version.ooc
@@ -120,7 +120,7 @@ _addComplexBuiltinSpec: func (key, condition, prelude, afterword: String) {
// Other Unices
_addBuiltinSpec("solaris", "__sun) && defined(__SVR4")
- _addBuiltinSpec("unix", "__unix__")
+ _addBuiltinSpec("unix", "__unix__) && !defined(__MSYS__")
// BeOSes
_addBuiltinSpec("beos", "__BEOS__")
Please sign in to comment.
Something went wrong with that request. Please try again.