From 23e95b42b447cf78f5076d06fd37bb0c8f61f91f Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Tue, 9 Jul 2019 23:55:05 +0200
Subject: [PATCH] qa.sh: Use clang++ to link (for ubsan)

---
 .travis.yml | 8 ++++----
 expat/qa.sh | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc61302b..40e9e7e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ env:
     - MODE=cmake
     - MODE=cmake-oos
     - MODE=distcheck
-    - MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ QA_SANITIZER=address
-    - MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ QA_SANITIZER=memory
-    - MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ QA_SANITIZER=undefined
-    - MODE=qa-sh QA_COMPILER=gcc   CC=gcc   CXX=g++     QA_PROCESSOR=gcov
+    - MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=address
+    - MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=memory
+    - MODE=qa-sh QA_COMPILER=clang CC=clang CXX=clang++ LD=clang++ QA_SANITIZER=undefined
+    - MODE=qa-sh QA_COMPILER=gcc   CC=gcc   CXX=g++     LD=ld      QA_PROCESSOR=gcov
 
 matrix:
   exclude:
diff --git a/expat/qa.sh b/expat/qa.sh
index 6f3bf6a8..ca7a6802 100755
--- a/expat/qa.sh
+++ b/expat/qa.sh
@@ -33,17 +33,18 @@ RUN() {
 
 
 populate_environment() {
-    : ${LD:=ld}
     : ${MAKE:=make}
 
     case "${QA_COMPILER}" in
         clang)
             : ${CC:=clang}
             : ${CXX:=clang++}
+            : ${LD:=clang++}
             ;;
         gcc)
             : ${CC:=gcc}
             : ${CXX:=g++}
+            : ${LD:=ld}
             ;;
     esac
 
-- 
2.40.0