Bug 1135654 - part 3 - move installation of MOZ_CLANG_RT_ASAN_LIB_PATH to moz.build; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Mon, 23 Feb 2015 08:29:12 -0500
changeset 230614 e8ec9655dce6c3a0af0b48e311d66291d643a990
parent 230613 45bd6da5c8f72b8c9973e912afa8c64505698867
child 230615 e847b1ee714d2594ad858cbec2caf673b5567991
push id11492
push usercbook@mozilla.com
push dateWed, 25 Feb 2015 11:14:01 +0000
treeherderfx-team@8edbdb8ca892 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1135654
milestone39.0a1
Bug 1135654 - part 3 - move installation of MOZ_CLANG_RT_ASAN_LIB_PATH to moz.build; r=mshal
build/Makefile.in
build/moz.build
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -56,23 +56,16 @@ LLDBINIT_OBJDIR := .lldbinit.in
 LLDBINIT_OBJDIR_PATH = $(DEPTH)
 LLDBINIT_OBJDIR_FLAGS += -Dtopsrcdir=$(abspath $(topsrcdir))
 PP_TARGETS += LLDBINIT_OBJDIR
 
 LLDBINIT_FINAL_TARGET_FILES := $(DEPTH)/.lldbinit
 LLDBINIT_FINAL_TARGET_DEST = $(FINAL_TARGET)
 INSTALL_TARGETS += LLDBINIT_FINAL_TARGET
 
-ifeq (1_1,$(MOZ_ASAN)_$(CLANG_CL))
-# Install the clang-cl runtime library for ASAN next to the binaries we produce.
-CLANG_RT_ASAN_FILES := $(MOZ_CLANG_RT_ASAN_LIB_PATH)
-CLANG_RT_ASAN_DEST = $(FINAL_TARGET)
-INSTALL_TARGETS += CLANG_RT_ASAN
-endif
-
 ifdef MOZTTDIR
 # Install the Firefox OS fonts.
 include $(MOZTTDIR)/fonts.mk
 MOZTT_DEST = $(FINAL_TARGET)/fonts
 MOZTT_FILES = $(patsubst external/moztt/%,$(MOZTTDIR)/%,$(filter external/moztt/%,$(subst :, ,$(PRODUCT_COPY_FILES))))
 INSTALL_TARGETS += MOZTT
 endif
 
--- a/build/moz.build
+++ b/build/moz.build
@@ -58,8 +58,12 @@ if CONFIG['ENABLE_TESTS'] or CONFIG['MOZ
         FINAL_TARGET_FILES += [tools_dir + 'fix_linux_stack.py']
 
 if CONFIG['MOZ_DMD']:
     FINAL_TARGET_FILES += [TOPSRCDIR + '/memory/replace/dmd/dmd.py']
 
 # Put a useful .gdbinit in the bin directory, to be picked up automatically
 # by GDB when we debug executables there.
 FINAL_TARGET_FILES += [TOPSRCDIR + '/.gdbinit']
+
+# Install the clang-cl runtime library for ASAN next to the binaries we produce.
+if CONFIG['MOZ_ASAN'] and CONFIG['CLANG_CL']:
+    FINAL_TARGET_FILES += [CONFIG['MOZ_CLANG_RT_ASAN_LIB_PATH']]