diff --git a/.travis.yml b/.travis.yml
index e1893939..c19a9c8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,11 @@ matrix:
       env: OPJ_CI_ARCH=i386
       addons:
         apt:
+          sources:
+            - ubuntu-toolchain-r-test
           packages:
-            - gcc-multilib
-            - g++-multilib
+            - gcc-7-multilib
+            - g++-7-multilib
             - libc6-i386
             - libcurl4-openssl-dev:i386
             - libpng12-dev:i386
diff --git a/main/source/linux/Makefile b/main/source/linux/Makefile
index 00f0c846..ed7730eb 100644
--- a/main/source/linux/Makefile
+++ b/main/source/linux/Makefile
@@ -61,7 +61,7 @@ ifeq ($(OS),Darwin)
 		CC ="$(COMPILER_BIN_DIR)/clang -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
 	endif
 	ifeq ($(origin CPLUS), default)
-		CPLUS ="$(COMPILER_BIN_DIR)/clang++ -std=c++14 -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
+		CPLUS ="$(COMPILER_BIN_DIR)/clang++ -std=c++14 -stdlib=libc++ -Qunused-arguments -isysroot $(SDKROOT) -mmacosx-version-min=10.5 -fasm-blocks -I$(SDKROOT)/usr/include/malloc $(ARCH_FLAGS)"
 	endif
 	LINK ?= $(CPLUS)
 endif