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

mkconfig.rb: cross_compiling option

Browse source 
* common.mk, tool/mkconfig.rb: set cross_compiling option from
  Makefile, but not from rbconfig.rb, which is just going to be
  created by this command.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-29 07:31:56 +00:00
parent 06efc1da42
commit 199e910602
3 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 29 16:31:01 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, tool/mkconfig.rb: set cross_compiling option from
Makefile, but not from rbconfig.rb, which is just going to be
created by this command.
Sun Feb 28 23:13:49 2016 C.J. Collier <cjcollier@linuxfoundation.org> Sun Feb 28 23:13:49 2016 C.J. Collier <cjcollier@linuxfoundation.org>
* configure.in: Add summary to end of configure output. * configure.in: Add summary to end of configure output.

1
common.mk
View file

@ -625,6 +625,7 @@ extconf: $(PREP)
$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \ $(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
-cross_compiling=$(CROSS_COMPILING) \
-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \ -arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
-install_name=$(RUBY_INSTALL_NAME) \ -install_name=$(RUBY_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) rbconfig.rb -so_name=$(RUBY_SO_NAME) rbconfig.rb

3
tool/mkconfig.rb
View file

@ -8,11 +8,12 @@
# avoid warnings with -d. # avoid warnings with -d.
$install_name ||= nil $install_name ||= nil
$so_name ||= nil $so_name ||= nil
$cross_compiling ||= nil
arch = $arch or raise "missing -arch" arch = $arch or raise "missing -arch"
version = $version or raise "missing -version" version = $version or raise "missing -version"
srcdir = File.expand_path('../..', __FILE__) srcdir = File.expand_path('../..', __FILE__)
$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING) $:.replace [srcdir+"/lib"] unless $cross_compiling == "yes"
$:.unshift(".") $:.unshift(".")
require "fileutils" require "fileutils"