[前][次][番号順一覧][スレッド一覧]

ruby-changes:45247

From: nobu <ko1@a...>
Date: Fri, 13 Jan 2017 14:58:49 +0900 (JST)
Subject: [ruby-changes:45247] nobu:r57320 (trunk): rbinstall.rb: LIBRUBY_RELATIVE

nobu	2017-01-13 14:58:44 +0900 (Fri, 13 Jan 2017)

  New Revision: 57320

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57320

  Log:
    rbinstall.rb: LIBRUBY_RELATIVE
    
    * tool/rbinstall.rb: see LIBRUBY_RELATIVE in CONFIG instead of
      reading config.h.

  Modified files:
    trunk/tool/rbinstall.rb
Index: tool/rbinstall.rb
===================================================================
--- tool/rbinstall.rb	(revision 57319)
+++ tool/rbinstall.rb	(revision 57320)
@@ -337,8 +337,7 @@ enable_shared = CONFIG["ENABLE_SHARED"] https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L337
 dll = CONFIG["LIBRUBY_SO", enable_shared]
 lib = CONFIG["LIBRUBY", true]
 arc = CONFIG["LIBRUBY_A", true]
-config_h = File.read(CONFIG["EXTOUT"]+"/include/"+CONFIG["arch"]+"/ruby/config.h")
-load_relative = config_h[/^\s*#\s*define\s+LOAD_RELATIVE\s+(\d+)/, 1].to_i.nonzero?
+load_relative = CONFIG["LIBRUBY_RELATIVE"] == 'yes'
 
 install?(:local, :arch, :bin, :'bin-arch') do
   prepare "binary commands", bindir

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]