From 21b7c6b0483ccfc3e9983af61fb049498c0f5fb7 Mon Sep 17 00:00:00 2001
From: Julius Volz <julius@soundcloud.com>
Date: Tue, 31 Mar 2015 18:07:40 +0200
Subject: [PATCH] Always build the procfs collector.

The cgo dependency in the "procfs" package is being removed in:

  https://github.com/prometheus/procfs/pull/4

So now it should be fine to always import the "procfs" package and have
it determine dynamically at runtime whether the proc filesystem is
actually there.

This fixes a problem for users which were vendoring client_golang on
MacOS X, but building the result on Linux (the procfs package was
missing in the vendored packages).
---
 prometheus/process_collector_procfs.go |  2 --
 prometheus/process_collector_rest.go   | 24 ------------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 prometheus/process_collector_rest.go

diff --git a/prometheus/process_collector_procfs.go b/prometheus/process_collector_procfs.go
index 5a09ded..b291d2b 100644
--- a/prometheus/process_collector_procfs.go
+++ b/prometheus/process_collector_procfs.go
@@ -11,8 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// +build linux,cgo plan9,cgo solaris,cgo
-
 package prometheus
 
 import "github.com/prometheus/procfs"
diff --git a/prometheus/process_collector_rest.go b/prometheus/process_collector_rest.go
deleted file mode 100644
index 0b3698a..0000000
--- a/prometheus/process_collector_rest.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Prometheus Authors
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !linux,!plan9,!solaris !cgo
-
-package prometheus
-
-func processCollectSupported() bool {
-	return false
-}
-
-func (c *processCollector) processCollect(ch chan<- Metric) {
-	panic("unreachable")
-}