diff --git a/.travis.yml b/.travis.yml
index 7fd5941..7350712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: cpp
-dist: trusty
+dist: xenial
 
 compiler:
   - clang
diff --git a/project/makefile b/project/makefile
index 8816545..c620d1c 100644
--- a/project/makefile
+++ b/project/makefile
@@ -44,6 +44,8 @@ BINARY_OUTPUT = $(PROJECT).$(LIBRARY_EXT)
 ifeq ($(findstring clang,$(COMPILER)),clang)
 	ifeq "$(OSX)" "false"
 		LINKER_FLAGS += -lgcc_eh
+	else
+		LINKER_FLAGS += -nostdlib++ -Wunused-command-line-argument
 	endif
 else ifeq ($(findstring gcc,$(COMPILER)),gcc)
 	ifneq "$(OSX)" "false"