Bug 1135654 - part 2 - move FINAL_TARGET's .gdbinit to FINAL_TARGET_FILES; r=mshal
authorNathan Froyd <froydnj@mozilla.com>
Mon, 23 Feb 2015 08:27:45 -0500
changeset 230532 45bd6da5c8f72b8c9973e912afa8c64505698867
parent 230531 ba350d5576dfff9b65d8053399920fba018b17ca
child 230533 e8ec9655dce6c3a0af0b48e311d66291d643a990
push id56031
push usernfroyd@mozilla.com
push dateTue, 24 Feb 2015 21:46:20 +0000
treeherdermozilla-inbound@e847b1ee714d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1135654
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1135654 - part 2 - move FINAL_TARGET's .gdbinit to FINAL_TARGET_FILES; r=mshal
build/Makefile.in
build/moz.build
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -37,26 +37,21 @@ ifdef MOZ_INCLUDE_SOURCE_INFO
 source_repo ?= $(call getSourceRepo,$(topsrcdir)/$(MOZ_BUILD_APP)/..)
 ifneq (,$(source_repo))
   DEFINES += -DMOZ_SOURCE_REPO='$(source_repo)'
 endif
 endif
 
 endif
 
-# Put a useful .gdbinit in the bin directory, to be picked up automatically
-# by GDB when we debug executables there.
 # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
-GDBINIT_FILES := $(topsrcdir)/.gdbinit
+# needs to be absolute to be distinct from $(topsrcdir)/.gdbinit
 GDBINIT_OBJDIR_FILES = $(topsrcdir)/.gdbinit
-GDBINIT_DEST = $(FINAL_TARGET)
-
-# needs to be absolute to be distinct from $(topsrcdir)/.gdbinit
 GDBINIT_OBJDIR_DEST = $(abspath $(DEPTH))
-INSTALL_TARGETS += GDBINIT GDBINIT_OBJDIR
+INSTALL_TARGETS += GDBINIT_OBJDIR
 
 # Put a .lldbinit in the bin directory and the objdir, to be picked up
 # automatically by LLDB when we debug executables using either of those two
 # directories as the current working directory.  The .lldbinit file will
 # load $(topsrcdir)/.lldbinit, which is where the actual debugging commands are.
 LLDBINIT_OBJDIR := .lldbinit.in
 LLDBINIT_OBJDIR_PATH = $(DEPTH)
 LLDBINIT_OBJDIR_FLAGS += -Dtopsrcdir=$(abspath $(topsrcdir))
--- a/build/moz.build
+++ b/build/moz.build
@@ -54,8 +54,12 @@ if CONFIG['ENABLE_TESTS'] or CONFIG['MOZ
     FINAL_TARGET_FILES += [tools_dir + 'fix_stack_using_bpsyms.py']
     if CONFIG['OS_ARCH'] == 'Darwin':
         FINAL_TARGET_FILES += [tools_dir + 'fix_macosx_stack.py']
     if CONFIG['OS_ARCH'] == 'Linux':
         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']