1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

goruby build was broken

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-05-20 18:13:08 +00:00
parent 466c78d5f2
commit 9fe9ffb842
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -209,6 +209,7 @@ INSTALLED_LIST= .installed.list
NEWLINE_C = enc/trans/newline.c NEWLINE_C = enc/trans/newline.c
MINIPRELUDE_C = miniprelude.c MINIPRELUDE_C = miniprelude.c
PRELUDE_C = prelude.c PRELUDE_C = prelude.c
GOLF_PRELUDE_C= golf_prelude.c
RBCONFIG = .rbconfig.time RBCONFIG = .rbconfig.time
MAINSRC = $(MAINOBJ:@OBJEXT@=c) MAINSRC = $(MAINOBJ:@OBJEXT@=c)

2
common.mk
View File

@ -1012,7 +1012,7 @@ $(PRELUDE_C): $(COMPILE_PRELUDE) \
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb $(GOLF_PRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
$(srcdir)/template/prelude.c.tmpl golf_prelude.rb $(srcdir)/template/prelude.c.tmpl golf_prelude.rb

5
win32/Makefile.sub
View File

@ -505,6 +505,11 @@ PRELUDE_C = $(srcdir)/prelude.c
!else !else
PRELUDE_C = prelude.c PRELUDE_C = prelude.c
!endif !endif
!if !exist(golf_prelude.c) && exist($(srcdir)/golf_prelude.c)
GOLF_PRELUDE_C = $(srcdir)/golf_prelude.c
!else
GOLF_PRELUDE_C = golf_prelude.c
!endif
RBCONFIG = ./.rbconfig.time RBCONFIG = ./.rbconfig.time
!include $(srcdir)/common.mk !include $(srcdir)/common.mk