aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-05 08:48:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-05 08:48:28 +0000
commitbf52a8b6c44a32a1e251ddc1dbb6904f4f6c6f87 (patch)
treec40866c27a4c4d7de39ef55dc9a9bf5429a83b13 /win32
parent80bedec6c25c82f2b37ecab5bab84576df52559c (diff)
downloadruby-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
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub2
1 files changed, 0 insertions, 2 deletions
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 \