Merge branch 'master' of github.com:idris-lang/Idris-dev
commit172f0dae2d0a6c0a11b54ecf3de664215d18f7e7
authorEdwin Brady <ecb10@st-andrews.ac.uk>
dateTue 22 Mar 2016, 09:55 (11 years ago)
parentd4b7dbd97075c6
config.mk+9−2
@@ -1,5 +1,12 @@
1−CC ?=cc
2−AR ?=ar
1+ifneq (, $(findstring MSYS, $(shell uname -a)))
2+ ifeq (cc,$(CC))
3+ # In MSYS2, when using the mingw version of gcc, there is no cc -> gcc
4+ # symlink. We can't use ?= here because CC is set implicitly to cc.
5+ # Cross compiling users can set CC to their cross compiler.
6+ CC =gcc
7+ endif
8+endif
9+
310RANLIB ?=ranlib
411
512CABAL :=cabal
docs/conf.py+2−2
@@ -59,9 +59,9 @@ author = u'The Idris Community'
5959# built documents.
6060#
6161# The short X.Y version.
62−version = '0.10.2'
62+version = '0.10.3'
6363# The full version, including alpha/beta/rc tags.
64−release = '0.10.2'
64+release = '0.10.3'
6565
6666# The language for content autogenerated by Sphinx. Refer to documentation
6767# for a list of supported languages.