diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 21:07:26 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 21:07:26 +0000 |
| commit | 3f7ce085375a1f3cf96861cb3633362933ddcb64 (patch) | |
| tree | 6093099b8b774a401da410388d06e035074672dc /common.mk | |
| parent | 6ee7fcf3097d82ee134f8a7a549d7244ac0a0a26 (diff) | |
merge revision(s) 49176,49334,49802,49814,49815,49816,50036,51453,51705,51706,51708,51805,51807,53298,53517,53519,53521,53522,53523,53526,53527,54017,54034:
* .travis.yml: Remove redundant configuration option.
[fix GH-809] Patch by @gxworld
* .travis.yml: removed Ruby 1.9.3 build on Travis CI
* .travis.yml: update libssl before running tests.
Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the
travis settings!
* .travis.yml: removed osx code. follow up with r53517
* .travis.yml: removed commented-out code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -152,7 +152,7 @@ COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmp all: showflags main docs -main: showflags $(ENCSTATIC:static=lib)encs exts +main: showflags exts $(ENCSTATIC:static=lib)encs @$(NULLCMD) .PHONY: showflags |