From 21cf2a1c6c40b760aa532e3878c048b00d8eeb91 Mon Sep 17 00:00:00 2001
From: Nathan Froyd <froydnj@mozilla.com>
Date: Mon, 22 Dec 2014 16:05:23 -0500
Subject: [PATCH] Bug 1117850 - package llvm-symbolizer with the installer when
 MOZ_TSAN is enabled; r=glandium

We're eventually going to need access to llvm-symbolizer when we do TSan
test runs, so make sure it gets included.
---
 browser/installer/package-manifest.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index a2f944bb616d..d22b8e553b7d 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -895,13 +895,14 @@ bin/libfreebl_32int64_3.so
 @RESPATH@/components/nsTerminatorTelemetry.js
 @RESPATH@/components/terminator.manifest
 
-#ifdef MOZ_ASAN
-#ifdef CLANG_CXX
+#if defined(CLANG_CXX)
+#if defined(MOZ_ASAN) || defined(MOZ_TSAN)
 @BINPATH@/llvm-symbolizer
 #endif
-#ifdef CLANG_CL
-@BINPATH@/clang_rt.asan_dynamic-i386.dll
 #endif
+
+#if defined(MOZ_ASAN) && defined(CLANG_CL)
+@BINPATH@/clang_rt.asan_dynamic-i386.dll
 #endif