[tor-commits] [tor-browser-build/master] Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds

[gk at torproject.org]

commit fe7d1b4ba0bc683c6b23d162c1ea7d7efa2b13d8
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Jan 9 12:39:18 2018 +0100

    Bug 24842: include libasan.so.2 and libubsan.so.0 in debug builds
---
 projects/tor/build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/projects/tor/build b/projects/tor/build
index ac51782..14ba58e 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -44,6 +44,10 @@ openssldir=/var/tmp/dist/openssl
   # the libstdc++ into the directory with the libs tor depends on, too. See bug
   # 13359 for further details.
   cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$distdir/Tor/"
+  [% IF c("var/asan") -%]
+    cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.2 "$distdir/Tor/"
+    cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.0 "$distdir/Tor/"
+  [% END -%]
   chmod 700 "$distdir"/Tor/*.so*
   # This is needed to make RPATH unavailable. See bug 9150.
   export LD_LIBRARY_PATH="$distdir/Tor/"