diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-05 08:48:28 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-05 08:48:28 +0000 |
| commit | bf52a8b6c44a32a1e251ddc1dbb6904f4f6c6f87 (patch) | |
| tree | c40866c27a4c4d7de39ef55dc9a9bf5429a83b13 | |
| parent | 80bedec6c25c82f2b37ecab5bab84576df52559c (diff) | |
| download | ruby-bf52a8b6c44a32a1e251ddc1dbb6904f4f6c6f87.tar.gz | |
Fix cross build
* 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
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | tool/fake.rb | 3 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -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> * hash.c (env_str_new, env_path_str_new): make default string diff --git a/Makefile.in b/Makefile.in index 91bc8fc45e..4ae4596f13 100644 --- a/Makefile.in +++ b/Makefile.in @@ -258,7 +258,7 @@ ruby-runner.c: template/ruby-runner.c.in ruby-runner$(EXEEXT): 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) diff --git a/tool/fake.rb b/tool/fake.rb index 9fe95a5bd6..353a7b7035 100644 --- a/tool/fake.rb +++ b/tool/fake.rb @@ -46,7 +46,8 @@ prehook = proc do |extmk| end join = proc {|*args| File.join(*args).sub!(/\A(?:\.\/)*/, '')} $topdir ||= builddir - $top_srcdir ||= join[$topdir, srcdir] + $top_srcdir ||= (File.identical?(top_srcdir, dir = join[$topdir, srcdir]) ? + dir : top_srcdir) $extout = '$(topdir)/.ext' $extout_prefix = '$(extout)$(target_prefix)/' config = RbConfig::CONFIG diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 751cdb24ea..60f2e23b2d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1061,9 +1061,7 @@ clean-enc distclean-enc realclean-enc: @-$(MAKE) -f $(ENC_MK) $(MFLAGS) V=$(V) $(@:-enc=) !endif -!if "$(CROSS_COMPILING)" == "no" $(RBCONFIG): $(PREP) -!endif $(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb @$(MINIRUBY) $(srcdir)/win32/resource.rb \ |