diff --git a/hecl/driver/CToolHelp.hpp b/hecl/driver/CToolHelp.hpp
index e1cb09ca9..5c8782f3e 100644
--- a/hecl/driver/CToolHelp.hpp
+++ b/hecl/driver/CToolHelp.hpp
@@ -11,7 +11,7 @@ public:
     CToolHelp(const SToolPassInfo& info)
     : CToolBase(info)
     {
-        if (!m_info.args.size())
+        if (m_info.args.empty())
             throw std::invalid_argument("help requires a tool name argument");
     }
 
diff --git a/hecl/driver/driver.pro b/hecl/driver/driver.pro
index af6163eaa..5ba8317d7 100644
--- a/hecl/driver/driver.pro
+++ b/hecl/driver/driver.pro
@@ -2,8 +2,10 @@ TARGET = hecl
 CONFIG -= Qt
 QT      =
 LIBS   -= -lQtGui -lQtCore
-unix:QMAKE_CXXFLAGS += -std=c++11 -stdlib=libc++
-unix:!macx:LIBS += -std=c++11 -stdlib=libc++ -lc++abi
+unix:QMAKE_CXXFLAGS += -std=c++11
+unix:LIBS += -std=c++11
+clang:QMAKE_CXXFLAGS += -stdlib=libc++
+clang:LIBS += -stdlib=libc++ -lc++abi
 
 INCLUDEPATH += ../include
 
diff --git a/hecl/lib/lib.pro b/hecl/lib/lib.pro
index 167fe0bde..314457326 100644
--- a/hecl/lib/lib.pro
+++ b/hecl/lib/lib.pro
@@ -3,7 +3,11 @@ CONFIG += staticlib
 TARGET = hecl
 CONFIG -= Qt
 QT      =
-unix:QMAKE_CXXFLAGS += -std=c++11 -stdlib=libc++
+unix:QMAKE_CXXFLAGS += -std=c++11
+unix:QMAKE_CFLAGS += -std=c99
+unix:LIBS += -std=c++11
+clang:QMAKE_CXXFLAGS += -stdlib=libc++
+clang:LIBS += -stdlib=libc++ -lc++abi
 
 INCLUDEPATH += $$PWD ../include ../extern