summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-29 07:31:56 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-29 07:31:56 (GMT)
commit199e910602dee48246fcbd9adb3986a3e01c4cb4 (patch)
tree01c7298ed4a1c2a4e9058dbaa583ea442ad969e7 /tool
parent06efc1da425d81a7575e9af2f62e5b2631b7d056 (diff)
mkconfig.rb: cross_compiling option
* 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
Diffstat (limited to 'tool')
-rwxr-xr-xtool/mkconfig.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb
index 63dbecb..63d0520 100755
--- a/tool/mkconfig.rb
+++ b/tool/mkconfig.rb
@@ -8,11 +8,12 @@
# avoid warnings with -d.
$install_name ||= nil
$so_name ||= nil
+$cross_compiling ||= nil
arch = $arch or raise "missing -arch"
version = $version or raise "missing -version"
srcdir = File.expand_path('../..', __FILE__)
-$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
+$:.replace [srcdir+"/lib"] unless $cross_compiling == "yes"
$:.unshift(".")
require "fileutils"