summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-01-20 13:51:40 -0800
committerTim Smith <tsmith@chef.io>2017-01-20 13:51:40 -0800
commitd6bbce1f90abd5065d1a7eca426048767e2ef30b (patch)
tree625bc0891c3698d1835fbb196a7c0643210e2499
parent869f4aa0af9e8d4f7e7f0f84864de9aefb9c3742 (diff)
downloadohai-d6bbce1f90abd5065d1a7eca426048767e2ef30b.tar.gz
Further split out platforms in the C plugin
cl / devenv are windows only so avoid checking those on *nix HP UX things should only get checked on HPUX
-rw-r--r--lib/ohai/plugins/c.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/ohai/plugins/c.rb b/lib/ohai/plugins/c.rb
index 107067aa..00c918c2 100644
--- a/lib/ohai/plugins/c.rb
+++ b/lib/ohai/plugins/c.rb
@@ -163,15 +163,19 @@ Ohai.plugin(:C) do
languages[:c] = c unless c.empty?
end
- collect_data(:default) do
+ collect_data(:hpux) do
+ c = Mash.new
+ collect_gcc
+ collect_hpux_cc
+ languages[:c] = c unless c.empty?
+ end
+
+ collect_data(:hpux) do
c = Mash.new
collect_gcc
collect_glibc
- check_for_cl
- check_for_devenv
collect_xlc
collect_cc
- collect_hpux_cc
languages[:c] = c unless c.empty?
end
end