From 99c58b9b35c275cc8ea42f227d0a84bfe31986a4 Mon Sep 17 00:00:00 2001
From: bryan <bryan.hunt@erlang-solutions.com>
Date: Sun, 8 Sep 2019 09:22:27 +0100
Subject: [PATCH 1/4] use and append existing compile flags

---
 c_src/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/c_src/Makefile b/c_src/Makefile
index cbac857..4d86045 100644
--- a/c_src/Makefile
+++ b/c_src/Makefile
@@ -21,18 +21,18 @@ MEMTEST_OUTPUT ?= $(CURDIR)/../_build/memory_test
 UNAME_SYS := $(shell uname -s)
 ifeq ($(UNAME_SYS), Darwin)
 	CXX ?= c++
-	CXXFLAGS ?= -O3 -arch x86_64 -finline-functions
-	LDFLAGS ?= -arch x86_64 -flat_namespace -undefined suppress
+	CXXFLAGS += -O3 -arch x86_64 -finline-functions
+	LDFLAGS += -arch x86_64 -flat_namespace -undefined suppress
 	PSOURCES = prometheus_process_info_macos.cc
 else ifeq ($(UNAME_SYS), FreeBSD)
 	CXX ?= c++
-	CXXEFLAGS ?= -D__STANDALONE_TEST__ -std=c++11 -Wall
-	CXXFLAGS ?= -O3 -finline-functions
+	CXXEFLAGS += -D__STANDALONE_TEST__ -std=c++11 -Wall
+	CXXFLAGS += -O3 -finline-functions
 	PSOURCES = prometheus_process_info_freebsd.cc
 else ifeq ($(UNAME_SYS), Linux)
 	CXX ?= g++
-	CXXEFLAGS ?= -D__STANDALONE_TEST__ -std=c++11 -Wall
-	CXXFLAGS ?= -O3 -finline-functions
+	CXXEFLAGS += -D__STANDALONE_TEST__ -std=c++11 -Wall
+	CXXFLAGS += -O3 -finline-functions
 	PSOURCES = prometheus_process_info_linux.cc
 endif
 

From 8a72de70e0a6e99fc886c80c00524f5db787dbb6 Mon Sep 17 00:00:00 2001
From: bryan <bryan.hunt@erlang-solutions.com>
Date: Sun, 8 Sep 2019 11:28:43 +0100
Subject: [PATCH 2/4] add elixir_make dependency

---
 mix.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index d352d35..8249453 100644
--- a/mix.exs
+++ b/mix.exs
@@ -49,7 +49,8 @@ defmodule PrometheusProcessCollector.Mixfile do
 
   defp deps do
     [
-      {:prometheus, "~> 4.0"}
+      {:prometheus, "~> 4.0"},
+      {:elixir_make, "~> 0.4", runtime: false}
     ]
   end
 end

From 949de0f187ca9627f1bb5715092f8346bddf4a97 Mon Sep 17 00:00:00 2001
From: bryan <bryan.hunt@erlang-solutions.com>
Date: Sun, 8 Sep 2019 11:38:09 +0100
Subject: [PATCH 3/4] restor elixir_make config

---
 mix.exs  | 4 ++--
 mix.lock | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mix.exs b/mix.exs
index 8249453..fb7679d 100644
--- a/mix.exs
+++ b/mix.exs
@@ -6,7 +6,7 @@ defmodule PrometheusProcessCollector.Mixfile do
       app: :prometheus_process_collector,
       version: "1.4.3",
       compilers: [:elixir_make] ++ Mix.compilers(),
-      # make_cwd: "c_src",
+      make_cwd: "c_src",
       description: description(),
       package: package(),
       deps: deps()
@@ -50,7 +50,7 @@ defmodule PrometheusProcessCollector.Mixfile do
   defp deps do
     [
       {:prometheus, "~> 4.0"},
-      {:elixir_make, "~> 0.4", runtime: false}
+      {:elixir_make, "~> 0.6", runtime: false}
     ]
   end
 end
diff --git a/mix.lock b/mix.lock
index e9c6dac..affdb34 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,3 +1,4 @@
 %{
+  "elixir_make": {:hex, :elixir_make, "0.6.0", "38349f3e29aff4864352084fc736fa7fa0f2995a819a737554f7ebd28b85aaab", [:mix], [], "hexpm"},
   "prometheus": {:hex, :prometheus, "4.2.2", "a830e77b79dc6d28183f4db050a7cac926a6c58f1872f9ef94a35cd989aceef8", [:mix, :rebar3], [], "hexpm"},
 }

From 53325de6b6b3dbf275e30ef972b36e7f4306398c Mon Sep 17 00:00:00 2001
From: bryanhuntesl <31992054+bryanhuntesl@users.noreply.github.com>
Date: Mon, 9 Sep 2019 18:26:10 +0100
Subject: [PATCH 4/4] remove erlang 18 - travis gettin' crufty

Yeah travis update your erlang versions list once in a while pleaze ! https://twitter.com/binarytemple/status/1170651866767736833
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9c22fe9..dc488d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ install: 'true'
 otp_release:
 - 20.0
 - 19.0
-- 18.0
 addons:
   apt:
     packages: