git.iko.soy/Idris-dev
on master help sign in
Merge branch 'master' of github.com:idris-lang/Idris-dev
172f0daEdwin Brady
config.mk+9−2
compare with master
unifiedsplit
@@ -1,5 +1,12 @@
1−CC ?=cc
1+ifneq (, $(findstring MSYS, $(shell uname -a)))
2−AR ?=ar
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+
3RANLIB ?=ranlib
10RANLIB ?=ranlib
4
11
5CABAL :=cabal
12CABAL :=cabal
docs/conf.py+2−2
@@ -59,9 +59,9 @@ author = u'The Idris Community'
59# built documents.
59# built documents.
60#
60#
61# The short X.Y version.
61# The short X.Y version.
62−version = '0.10.2'
62+version = '0.10.3'
63# The full version, including alpha/beta/rc tags.
63# The full version, including alpha/beta/rc tags.
64−release = '0.10.2'
64+release = '0.10.3'
65
65
66# The language for content autogenerated by Sphinx. Refer to documentation
66# The language for content autogenerated by Sphinx. Refer to documentation
67# for a list of supported languages.
67# for a list of supported languages.