aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Sloughter <[email protected]>2014-06-19 21:04:50 -0500
committerTristan Sloughter <[email protected]>2014-06-19 21:04:50 -0500
commitcccd90a7504e74f8c66fb8acbdc686fc22ee39c2 (patch)
tree9db6722bb6e2b5abe7676d327be455275ac4e52d
parentd6e12b0694e466a98d7fef7bca735b73f28cff31 (diff)
parente9e6c38a112480a9d893848e6e4d556357d13daf (diff)
downloadrelx-cccd90a7504e74f8c66fb8acbdc686fc22ee39c2.tar.gz
relx-cccd90a7504e74f8c66fb8acbdc686fc22ee39c2.tar.bz2
relx-cccd90a7504e74f8c66fb8acbdc686fc22ee39c2.zip
Merge pull request #195 from edescourtis/master
Erlang 17+ doesn't start by 'R'
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b7ee1e5..ad4b5d6 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ endif
# dialyzer on R15 and above. However on R14 and below we have the
# problem that travis times out. The code below lets us not run
# dialyzer on R14
-OTP_VSN=$(shell erl -noshell -eval 'io:format("~p", [erlang:system_info(otp_release)]), erlang:halt(0).' | perl -lne 'print for /R(\d+).*/g')
+OTP_VSN=$(shell erl -noshell -eval 'io:format("~p", [erlang:system_info(otp_release)]), erlang:halt(0).' | perl -lne 'print for /R{0,1}(\d+).*/g')
TRAVIS_SLOW=$(shell expr $(OTP_VSN) \<= 15 )
ifeq ($(TRAVIS_SLOW), 0)