From 5dd18b314b482020be0014f6a0257d20a183b630 Mon Sep 17 00:00:00 2001
From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Wed, 22 Feb 2017 08:15:17 +0100
Subject: [PATCH] travis.yml: reduce number of jobs to 7

---
 .travis.yml | 3 ++-
 Makefile    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8688035e..41d90f38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ matrix:
 
 
     # Ubuntu 14.04 LTS Server Edition 64 bit
-    - env: Ubu=14.04 Cmd='LDFLAGS=-fuse-ld=gold make uasan-test && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
+    - env: Ubu=14.04 Cmd='make uasan-test && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
       dist: trusty
       sudo: required
       install:
@@ -35,6 +35,7 @@ matrix:
             - libc6-dev-i386
             - gcc-multilib
             - gcc-6
+            - gcc-6-multilib
 
     - env: Ubu=14.04 Cmd="make armtest && make clean && make aarch64test"
       dist: trusty
diff --git a/Makefile b/Makefile
index ff624e90..128c72bb 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ uasan: clean
 	$(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"
 
 uasan-%: clean
-	CFLAGS="-Og -fsanitize=address -fsanitize=undefined" $(MAKE) -C $(TESTDIR) $*
+	LDFLAGS=-fuse-ld=gold CFLAGS="-Og -fsanitize=address -fsanitize=undefined" $(MAKE) -C $(TESTDIR) $*
 
 endif