kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fixed build failure of Travis CI. We need to support make srcs.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2019-03-01 08:31:43 +00:00
parent a4020fbefc
commit 19cf8e0387
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common.mk
View file

@ -1096,7 +1096,7 @@ $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/p
$(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \ $(Q) VPATH=$${PWD-`pwd`} && $(CHDIR) $(@D) && \
sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \ sed -e 's/{\$$([^(){}]*)[^{}]*}//g' -e /AUTOGENERATED/q depend | \
$(exec) $(MAKE) -f - $(mflags) \ $(exec) $(MAKE) -f - $(mflags) \
Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \ Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl

6
ext/ripper/extconf.rb
View file

@ -5,7 +5,9 @@ require 'mkmf'
require 'rbconfig' require 'rbconfig'
def main def main
unless find_executable(ENV["YACC"] || 'bison') yacc = ENV["YACC"] || "bison"
unless find_executable(yacc)
unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c") unless File.exist?('ripper.c') or File.exist?("#{$srcdir}/ripper.c")
raise 'missing bison; abort' raise 'missing bison; abort'
end end
@ -17,7 +19,7 @@ def main
$VPATH << '$(topdir)' << '$(top_srcdir)' $VPATH << '$(topdir)' << '$(top_srcdir)'
$INCFLAGS << ' -I$(topdir) -I$(top_srcdir)' $INCFLAGS << ' -I$(topdir) -I$(top_srcdir)'
create_makefile 'ripper' do |conf| create_makefile 'ripper' do |conf|
conf << "BISON = #{ENV['YACC'] || 'bison'}" conf << "BISON = #{yacc}"
end end
end end