From 655fbfc399cf157366f4df9c27d28c44bdc62844 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 1 May 2017 18:44:26 +0100
Subject: [PATCH] Problem: ASAN test doesn't print good traces with GCC 4.8

Solution: add Ubuntu toolchain PPA and use GCC 6
---
 .travis.yml | 8 ++++++++
 ci_build.sh | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 768fa3e4..f6dda37a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,14 @@ matrix:
     os: osx
   - env: BUILD_TYPE=default CURVE=tweetnacl DRAFT=enabled ADDRESS_SANITIZER=enabled
     os: linux
+    dist: trusty
+    addons:
+      apt:
+        sources:
+        - sourceline: 'ppa:ubuntu-toolchain-r/test'
+        packages:
+        - g++-6
+        - gcc-6
 
 sudo: required
 
diff --git a/ci_build.sh b/ci_build.sh
index 2ddc7b1e..a125f8d7 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -17,6 +17,11 @@ if [ $BUILD_TYPE == "default" ]; then
 
     if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" == "enabled" ]; then
         CONFIG_OPTS+=("--enable-address-sanitizer=yes")
+        CONFIG_OPTS+=("CXX=g++-6")
+        CONFIG_OPTS+=("CC=gcc-6")
+        # workaround for linker problem with ASAN options in GCC
+        # http://stackoverflow.com/questions/37603238/fsanitize-not-using-gold-linker-in-gcc-6-1
+        CONFIG_OPTS+=("LDFLAGS=-fuse-ld=gold")
     fi
 
     if [ -z $CURVE ]; then