josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

consolidate some configure check reporting

Browse Source
This commit is contained in:
Josh Holtrop 2018-11-14 23:30:47 -05:00
parent ab4ca71ac7
commit ba3d656110
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/rscons/configure_op.rb
View File

@ -44,12 +44,7 @@ module Rscons
cc = ccc.find do |cc| cc = ccc.find do |cc|
test_c_compiler(cc) test_c_compiler(cc)
end end
if cc common_config_checks(cc ? 0 : 1, success_message: cc)
Ansi.write($stdout, :green, cc, "\n")
else
Ansi.write($stdout, :red, "not found\n")
raise ConfigureFailure.new
end
end end
# Check for a working C++ compiler. # Check for a working C++ compiler.
@ -67,12 +62,7 @@ module Rscons
cc = ccc.find do |cc| cc = ccc.find do |cc|
test_cxx_compiler(cc) test_cxx_compiler(cc)
end end
if cc common_config_checks(cc ? 0 : 1, success_message: cc)
Ansi.write($stdout, :green, cc, "\n")
else
Ansi.write($stdout, :red, "not found\n")
raise ConfigureFailure.new
end
end end
# Check for a working D compiler. # Check for a working D compiler.
@ -90,12 +80,7 @@ module Rscons
dc = cdc.find do |dc| dc = cdc.find do |dc|
test_d_compiler(dc) test_d_compiler(dc)
end end
if dc common_config_checks(dc ? 0 : 1, success_message: dc)
Ansi.write($stdout, :green, dc, "\n")
else
Ansi.write($stdout, :red, "not found\n")
raise ConfigureFailure.new
end
end end
# Check for a package or configure program output. # Check for a package or configure program output.