From b09ccf57763280c5ad747d8223908e9a55fc05d6 Mon Sep 17 00:00:00 2001
From: Reuben Thomas <rrt@sc3d.org>
Date: Fri, 11 Dec 2020 07:48:41 +0000
Subject: AppVeyor: make ASAN build actually build with ASAN

Also add ASAN flags to CXXFLAGS
---
 .appveyor.yml               | 3 ++-
 build-aux/appveyor-build.sh | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e09fe5c..571fbf2 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,9 +6,9 @@ environment:
     CONFIGURE_FLAGS: --with-hunspell-dir=/mingw64/share/hunspell
     VERBOSE: 1 # Get test logs in output
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
     - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
       ASAN: 'yes'
+    - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu
     - APPVEYOR_BUILD_WORKER_IMAGE: macos
     # MSYS does not have hunspell packages
     # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
@@ -27,6 +27,7 @@ for:
     - sudo add-apt-repository -y ppa:nuspell/ppa
     - sudo apt-get -y install libglib2.0-dev libaspell-dev hspell libhunspell-dev libvoikko-dev voikko-fi aspell-en libunittest++-dev hunspell-fr libnuspell-dev
   build_script:
+    - export ASAN
     - ./build-aux/appveyor-build.sh
 -
   matrix:
diff --git a/build-aux/appveyor-build.sh b/build-aux/appveyor-build.sh
index 6472d91..db42400 100755
--- a/build-aux/appveyor-build.sh
+++ b/build-aux/appveyor-build.sh
@@ -8,9 +8,9 @@ set -e
 ./bootstrap
 CONFIGURE_ARGS=(--enable-relocatable --with-zemberek=check)
 if [[ "$ASAN" == "yes" ]]; then
-    CONFIGURE_ARGS+=(CFLAGS="-g3 -fsanitize=address -fsanitize=undefined" LDFLAGS="-fsanitize=address -fsanitize=undefined")
+    CONFIGURE_ARGS+=(CFLAGS="-g3 -fsanitize=address -fsanitize=undefined" CXXFLAGS="-g3 -fsanitize=address -fsanitize=undefined" LDFLAGS="-fsanitize=address -fsanitize=undefined")
 fi
-./configure --enable-silent-rules "${CONFIGURE_ARGS[@]}"
+./configure "${CONFIGURE_ARGS[@]}"
 make
 make distcheck
 
-- 
cgit v1.2.1