diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-04 09:04:58 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-04 09:04:58 +0000 |
commit | ea9301bd2bf814438e31c6d5d9e78354b75752c1 (patch) | |
tree | 157dbe8ece8e4f32b11ab5fc62981f0a6ce7b792 /Makefile.in | |
parent | 2d08d23e9cdd13616d8819aa7a582d3a5838636f (diff) |
* common.mk (yes-btest): btest depends on also $(arch)-fake.rb and
rbconfig.rb on building for NativeClient.
* Makefile.in (fake): Avoid generating $(arch)-fake.rb unless cross
compiling.
* configure.in (CROSS_COMPILING): New substitution.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index c0f638fdcf..f652db2027 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,6 +26,7 @@ AUTOCONF = autoconf MKFILES = @MAKEFILES@ BASERUBY = @BASERUBY@ TEST_RUNNABLE = @TEST_RUNNABLE@ +CROSS_COMPILING = @CROSS_COMPILING@ DOXYGEN = @DOXYGEN@ prefix = @prefix@ @@ -221,8 +222,9 @@ $(LIBRUBY_SO): @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true - -fake: $(arch)-fake.rb +fake: $(CROSS_COMPILING)-fake +yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY +no-fake: PHONY $(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in @./config.status --file=$@:$(srcdir)/template/fake.rb.in @chmod +x $@ |