diff options
| author | Tristan Sloughter <[email protected]> | 2014-06-19 21:04:50 -0500 |
|---|---|---|
| committer | Tristan Sloughter <[email protected]> | 2014-06-19 21:04:50 -0500 |
| commit | cccd90a7504e74f8c66fb8acbdc686fc22ee39c2 (patch) | |
| tree | 9db6722bb6e2b5abe7676d327be455275ac4e52d | |
| parent | d6e12b0694e466a98d7fef7bca735b73f28cff31 (diff) | |
| parent | e9e6c38a112480a9d893848e6e4d556357d13daf (diff) | |
| download | relx-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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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) |