Merge pull request #4994 from MikeMcQuaid/config-hide-optional

config: hide optional system packages.
This commit is contained in:
Mike McQuaid 2018-09-30 12:49:23 +01:00 committed by GitHub
commit 1ee8c60834
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions

View File

@ -57,11 +57,9 @@ class SystemConfig
dump_generic_verbose_config(f)
f.puts "macOS: #{MacOS.full_version}-#{kernel}"
f.puts "CLT: #{clt || "N/A"}"
if MacOS::CLT.separate_header_package?
f.puts "CLT headers: #{clt_headers || "N/A"}"
end
f.puts "Xcode: #{xcode || "N/A"}"
f.puts "XQuartz: #{xquartz || "N/A"}"
f.puts "CLT headers: #{clt_headers}" if MacOS::CLT.separate_header_package? && clt_headers
f.puts "XQuartz: #{xquartz}" if !MacOS::XQuartz.provided_by_apple? && xquartz
end
end
end

View File

@ -196,7 +196,7 @@ class SystemConfig
end
f.puts "Git: #{describe_git}"
f.puts "Curl: #{describe_curl}"
f.puts "Java: #{describe_java}"
f.puts "Java: #{describe_java}" if describe_java != "N/A"
end
alias dump_generic_verbose_config dump_verbose_config
end