[tor-commits] [tor-browser-build/master] Bug 31450: Use still GCC for our ASan builds

[boklm at torproject.org]

commit 47670953afb9026f2e49301f494d5a2faba15ec2
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Sep 8 09:38:58 2019 +0000

    Bug 31450: Use still GCC for our ASan builds
---
 projects/firefox/build | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/build b/projects/firefox/build
index 87f8532..ba8422a 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -29,8 +29,11 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
 [% IF c("var/linux") || c("var/android") %]
   tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/binutils') %]
   export PATH="/var/tmp/dist/binutils/bin:$PATH"
-  # Use clang for everything on Linux now.
-  export PATH="/var/tmp/dist/clang/bin:$PATH"
+  # Use clang for everything on Linux and Android now if we don't build with
+  # ASan.
+  [% IF ! c("var/asan") -%]
+    export PATH="/var/tmp/dist/clang/bin:$PATH"
+  [% END -%]
 [% END -%]
 
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz