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

Fix cross build

Browse source 
* tool/fake.rb: Fix cross build when srcdir is an absolute path.
* Makefile.in: PREP dependency is needed when cross build too, not
  "-r$(arch)-fake" to be  used before created.  [Fix GH-1125]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-05 08:48:28 +00:00
parent 80bedec6c2
commit bf52a8b6c4
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Dec 5 17:48:25 2015 Lars Kanis <lars@greiz-reinsdorf.de>
* tool/fake.rb: Fix cross build when srcdir is an absolute path.
* Makefile.in: PREP dependency is needed when cross build too, not
"-r$(arch)-fake" to be used before created. [Fix GH-1125]
Sat Dec 5 17:26:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 5 17:26:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (env_str_new, env_path_str_new): make default string * hash.c (env_str_new, env_path_str_new): make default string

2
Makefile.in
View file

@ -258,7 +258,7 @@ ruby-runner.c: template/ruby-runner.c.in
ruby-runner$(EXEEXT): ruby-runner.c ruby-runner$(EXEEXT): ruby-runner.c
$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ ruby-runner.c $(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ ruby-runner.c
$(RBCONFIG): $($(CROSS_COMPILING:no=)PREP) $(RBCONFIG): $(PREP)
rbconfig.rb: $(RBCONFIG) rbconfig.rb: $(RBCONFIG)

3
tool/fake.rb
View file

@ -46,7 +46,8 @@ prehook = proc do |extmk|
end end
join = proc {|*args| File.join(*args).sub!(/\A(?:\.\/)*/, '')} join = proc {|*args| File.join(*args).sub!(/\A(?:\.\/)*/, '')}
$topdir ||= builddir $topdir ||= builddir
$top_srcdir ||= join[$topdir, srcdir] $top_srcdir ||= (File.identical?(top_srcdir, dir = join[$topdir, srcdir]) ?
dir : top_srcdir)
$extout = '$(topdir)/.ext' $extout = '$(topdir)/.ext'
$extout_prefix = '$(extout)$(target_prefix)/' $extout_prefix = '$(extout)$(target_prefix)/'
config = RbConfig::CONFIG config = RbConfig::CONFIG

2
win32/Makefile.sub
View file

@ -1061,9 +1061,7 @@ clean-enc distclean-enc realclean-enc:
@-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=) @-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=)
!endif !endif
!if "$(CROSS_COMPILING)" == "no"
$(RBCONFIG): $(PREP) $(RBCONFIG): $(PREP)
!endif
$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \ @$(MINIRUBY) $(srcdir)/win32/resource.rb \