diff --git a/Adapter.hh b/Adapter.hh
index 55bc101..711cae3 100644
--- a/Adapter.hh
+++ b/Adapter.hh
@@ -31,7 +31,7 @@ namespace pEp {
                 T *obj = nullptr,
                 std::function< void (T *) > _startup = nullptr,
                 std::function< void (T *) > _shutdown = nullptr
-            ) throw (RuntimeError);
+            );
 
         // returns 'true' when called from the "sync" thread, 'false' otherwise.
         bool on_sync_thread();
diff --git a/Adapter.hxx b/Adapter.hxx
index 8632953..39cea22 100644
--- a/Adapter.hxx
+++ b/Adapter.hxx
@@ -66,7 +66,6 @@ namespace pEp {
             function< void(T *) > _startup,
             function< void(T *) > _shutdown
         )
-            throw (RuntimeError)
         {
             if (messageToSend)
                 _messageToSend = messageToSend;
diff --git a/Makefile.conf b/Makefile.conf
index bb95499..28496ff 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -7,19 +7,15 @@ HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
 
 
 PREFIX=$(HOME)
-CXXFLAGS=-std=c++11 
+CXXFLAGS=-std=c++11 -fPIC -O0 $(ENGINE_INC)
 
 # Build target
 BUILD_FOR:=$(shell uname)
 
-ifeq ($(BUILD_FOR),Linux)
-    $(info Building for Linux)
-    CXX=g++
-    CXXFLAGS+=-fdiagnostics-color=always -O0 $(ENGINE_INC) -fPIC
-else ifeq ($(BUILD_FOR),Darwin)
-    $(info Building for Darwin)
-    CXX=clang
-    CXXFLAGS+=-fcolor-diagnostics -O0 $(ENGINE_INC)
+ifneq (,$(findstring g++,$(CXX)))
+    CXXFLAGS+=-fdiagnostics-color=always
+else ifneq (,$(findstring clang,$(CXX)))
+    CXXFLAGS+=-fcolor-diagnostics
 endif
 
 # Debug or Release build