Merge pull request #19 from esl/feature/fix-cflags

use and append existing compile flags

.travis.yml

@@ -4,7 +4,6 @@ install: 'true'
 otp_release:
 - 20.0
 - 19.0
-- 18.0
 addons:
   apt:
     packages:

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
 

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()
@@ -49,7 +49,8 @@ defmodule PrometheusProcessCollector.Mixfile do
 
   defp deps do
     [
-      {:prometheus, "~> 4.0"}
+      {:prometheus, "~> 4.0"},
+      {:elixir_make, "~> 0.6", runtime: false}
     ]
   end
 end

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"},
 }