fix ASAN paths

Author: vchuravy

Make.inc

@@ -1387,7 +1387,7 @@ endif
 # Note: we're passing *FLAGS here computed based on your system compiler to
 # clang. If that causes you problems, you might want to build and/or run
 # specific clang-sa-* files with clang explicitly selected:
-#   make CC=~+/../usr/tools/clang CXX=~+/../usr/tools/clang USECLANG=1 analyzegc
+#   make CC=~+/../usr/bin/clang CXX=~+/../usr/bin/clang USECLANG=1 analyzegc
 #   make USECLANG=1 clang-sa-*
 CLANGSA_FLAGS :=
 CLANGSA_CXXFLAGS :=

contrib/asan/Make.user.asan

@@ -1,10 +1,12 @@
-TOOLCHAIN=$(BUILDROOT)/../toolchain/usr/tools
+TOOLCHAIN=$(BUILDROOT)/../toolchain
+BINDIR=$(TOOLCHAIN)/usr/bin
+TOOLDIR=$(TOOLCHAIN)/usr/tools
 
 # use our new toolchain
 USECLANG=1
-override CC=$(TOOLCHAIN)/clang
-override CXX=$(TOOLCHAIN)/clang++
-export ASAN_SYMBOLIZER_PATH=$(TOOLCHAIN)/llvm-symbolizer
+override CC=$(BINDIR)/clang
+override CXX=$(TOOLDIR)/clang++
+export ASAN_SYMBOLIZER_PATH=$(TOOLDIR)/llvm-symbolizer
 
 USE_BINARYBUILDER_LLVM=1
 

contrib/asan/build.sh

@@ -41,6 +41,10 @@ fi
 
 make -C "$TOOLCHAIN/deps" install-clang install-llvm-tools
 
+# TODO: https://github.com/JuliaPackaging/Yggdrasil/issues/3359
+rm "$TOOLCHAIN/usr/tools/clang++"
+ln -s "$TOOLCHAIN/usr/bin/clang" "$TOOLCHAIN/usr/tools/clang++"
+
 echo
 echo "Building Julia..."