From d5c776ad58990f64f671e796df5cc6efdbe87677 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 2 May 2017 12:45:07 +0000 Subject: [PATCH] mkconfig.rb: remove cross_compiling git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58543 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 1 - tool/mkconfig.rb | 2 -- 2 files changed, 3 deletions(-) diff --git a/common.mk b/common.mk index 389311b0da..fe133c1618 100644 --- a/common.mk +++ b/common.mk @@ -699,7 +699,6 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h -e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \ $(UNICODE_VERSION) $(UNICODE_DATA_HEADERS) $(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \ - -cross_compiling=$(CROSS_COMPILING) \ -arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) \ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 372e0868c7..d6c86b4803 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -8,13 +8,11 @@ # avoid warnings with -d. $install_name ||= nil $so_name ||= nil -$cross_compiling ||= nil $unicode_version ||= nil arch = $arch or raise "missing -arch" version = $version or raise "missing -version" srcdir = File.expand_path('../..', __FILE__) -$:.replace [srcdir+"/lib"] unless $cross_compiling == "yes" $:.unshift(".") require "fileutils"