Merge pull request #4994 from MikeMcQuaid/config-hide-optional
config: hide optional system packages.
This commit is contained in:
commit
1ee8c60834
@ -57,11 +57,9 @@ class SystemConfig
|
|||||||
dump_generic_verbose_config(f)
|
dump_generic_verbose_config(f)
|
||||||
f.puts "macOS: #{MacOS.full_version}-#{kernel}"
|
f.puts "macOS: #{MacOS.full_version}-#{kernel}"
|
||||||
f.puts "CLT: #{clt || "N/A"}"
|
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 "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
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@ -196,7 +196,7 @@ class SystemConfig
|
|||||||
end
|
end
|
||||||
f.puts "Git: #{describe_git}"
|
f.puts "Git: #{describe_git}"
|
||||||
f.puts "Curl: #{describe_curl}"
|
f.puts "Curl: #{describe_curl}"
|
||||||
f.puts "Java: #{describe_java}"
|
f.puts "Java: #{describe_java}" if describe_java != "N/A"
|
||||||
end
|
end
|
||||||
alias dump_generic_verbose_config dump_verbose_config
|
alias dump_generic_verbose_config dump_verbose_config
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user