summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2023-07-10 19:19:37 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2023-07-10 19:21:47 +0900
commit2951e3d83b302b914d291b83f48ac59dc5df3198 (patch)
tree2fa313b00130b15549eddda3b3607cf7b50e65bd
parentc8d0470bb0888bcb6719ba536e5f3f6a8b6551bb (diff)
Allow nmake to ignore errors
cmd.exe can redirect file descriptor other than STDOUT, while command.com couldn't.
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/8050
-rw-r--r--lib/mkmf.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index cd67645a5d..2acff0ddc0 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -2699,7 +2699,7 @@ MESSAGE
when $mswin
$nmake = ?m if /nmake/i =~ make
end
- $ignore_error = $nmake ? '' : " 2> #{File::NULL} || true"
+ $ignore_error = " 2> #{File::NULL} || #{$mswin ? 'exit /b0' : 'true'}"
RbConfig::CONFIG["srcdir"] = CONFIG["srcdir"] =
$srcdir = arg_config("--srcdir", File.dirname($0))