summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 14:04:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-15 14:04:29 +0000
commit285f139076d0a485270a5638e317ce4e5727d21a (patch)
tree1e79a12ea8299120af66813f528fffd7b656d612
parent2fbd11c77a0013f56b8b58183298da652f9d6ee6 (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--spec/rubyspec/optional/capi/spec_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/rubyspec/optional/capi/spec_helper.rb b/spec/rubyspec/optional/capi/spec_helper.rb
index 71b765d..c250253 100644
--- a/spec/rubyspec/optional/capi/spec_helper.rb
+++ b/spec/rubyspec/optional/capi/spec_helper.rb
@@ -59,7 +59,7 @@ def compile_extension(name)
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