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

ruby-changes:46981

From: usa <ko1@a...>
Date: Thu, 15 Jun 2017 23:04:36 +0900 (JST)
Subject: [ruby-changes:46981] usa:r59096 (trunk): Clear `DESTDIR` when running make

usa	2017-06-15 23:04:29 +0900 (Thu, 15 Jun 2017)

  New Revision: 59096

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

  Log:
    Clear `DESTDIR` when running make
    
    * spec/rubyspec/optional/capi/spec_helper.rb (compile_extension): `DESTDIR` is
      the drive letter of the ruby installed path as default on mswin, but not
      builddir of the ruby.  this causes spec errors if the drive letter is
      different in the installed path and builddir.

  Modified files:
    trunk/spec/rubyspec/optional/capi/spec_helper.rb
Index: spec/rubyspec/optional/capi/spec_helper.rb
===================================================================
--- spec/rubyspec/optional/capi/spec_helper.rb	(revision 59095)
+++ spec/rubyspec/optional/capi/spec_helper.rb	(revision 59096)
@@ -59,7 +59,7 @@ def compile_extension(name) https://github.com/ruby/ruby/blob/trunk/spec/rubyspec/optional/capi/spec_helper.rb#L59
       ENV.delete "MAKEFLAGS" # Fix make warning when invoked with -j in MRI
 
       # Do not capture stderr as we want to show compiler warnings
-      output = `#{make} V=1`
+      output = `#{make} V=1 DESTDIR=`
       raise "#{make} failed:\n#{output}" unless $?.success?
       $stderr.puts output if debug
 

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

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