diff options
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | template/Makefile.in | 2 | ||||
| -rwxr-xr-x | tool/make-snapshot | 6 | ||||
| -rw-r--r-- | win32/Makefile.sub | 6 |
4 files changed, 8 insertions, 8 deletions
@@ -1070,7 +1070,7 @@ PHONY: {$(srcdir)}.y.c: $(ECHO) generating $@ $(Q)$(BASERUBY) $(tooldir)/id2token.rb $(SRC_FILE) | \ - $(YACC) $(YFLAGS) -o$@ -H$*.h - parse.y + $(LRAMA) $(YFLAGS) -o$@ -H$*.h - parse.y $(PLATFORM_D): $(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D) diff --git a/template/Makefile.in b/template/Makefile.in index bef5a08539..695f7cec55 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -29,7 +29,7 @@ CPP = @CPP@ LD = @LD@ RUSTC = @RUSTC@ CARGO = @CARGO@ -YACC = $(BASERUBY) $(tooldir)/lrama/exe/lrama +LRAMA = $(BASERUBY) $(tooldir)/lrama/exe/lrama PURIFY = AUTOCONF = autoconf CONFIGURE = @CONFIGURE@ diff --git a/tool/make-snapshot b/tool/make-snapshot index 3479e2ac85..44cbcd070a 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -72,7 +72,7 @@ GITURL = URI.parse("https://github.com/ruby/ruby.git") RUBY_VERSION_PATTERN = /^\#define\s+RUBY_VERSION\s+"([\d.]+)"/ ENV["VPATH"] ||= "include/ruby" -YACC = ENV["YACC"] ||= "#{$tooldir}/lrama/exe/lrama" +LRAMA = ENV["LRAMA"] ||= "#{$tooldir}/lrama/exe/lrama" ENV["BASERUBY"] ||= "ruby" ENV["RUBY"] ||= "ruby" ENV["MV"] ||= "mv" @@ -118,7 +118,7 @@ $digests ||= DIGESTS $patch_file &&= File.expand_path($patch_file) path = ENV["PATH"].split(File::PATH_SEPARATOR) -%w[YACC BASERUBY RUBY MV MINIRUBY].each do |var| +%w[LRAMA BASERUBY RUBY MV MINIRUBY].each do |var| cmd, = ENV[var].shellsplit unless path.any? {|dir| file = File.expand_path(cmd, dir) @@ -514,7 +514,7 @@ touch-unicode-files: end print "prerequisites" else - system(*%W"#{YACC} -o parse.c parse.y") + system(*%W"#{LRAMA} -o parse.c parse.y") end vcs.after_export(".") if exported clean.concat(Dir.glob("ext/**/autom4te.cache")) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 0cd89c0bd9..3129f0804c 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -105,8 +105,8 @@ CC = cl -nologo !if !defined(CPP) || "$(CPP)" == "cl" CPP = $(CC) -E !endif -!if !defined(YACC) -YACC = $(BASERUBY) $(top_srcdir)/tool/lrama/exe/lrama +!if !defined(LRAMA) +LRAMA = $(BASERUBY) $(top_srcdir)/tool/lrama/exe/lrama !endif AR = lib -nologo PURIFY = @@ -1040,7 +1040,7 @@ s,@CC@,$(CC),;t t s,@CPP@,$(CPP),;t t s,@CXX@,$$(CC),;t t s,@LD@,$$(CC),;t t -s,@YACC@,$(YACC),;t t +s,@LRAMA@,$(LRAMA),;t t s,@RANLIB@,,;t t s,@AR@,$(AR),;t t s,@ARFLAGS@,$(ARFLAGS),;t t |