Bug 1482299 - Replace libxul.mk with OBJDIR_PP_FILES. r=ted,firefox-build-system-reviewers
authorChris Manchester <cmanchester@mozilla.com>
Wed, 15 Aug 2018 14:04:00 +0000
changeset 487011 d3c6ea00c0bd57c71d257191dbaa40c192ba1e26
parent 487010 62c11588e3abb4ea5dba0849f29a9204dff46823
child 487012 3567e433384608b2df9c8b0124afa595edd2c3dc
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted, firefox-build-system-reviewers
bugs1482299
milestone63.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 1482299 - Replace libxul.mk with OBJDIR_PP_FILES. r=ted,firefox-build-system-reviewers Differential Revision: https://phabricator.services.mozilla.com/D3371
toolkit/library/Makefile.in
toolkit/library/gtest/Makefile.in
toolkit/library/gtest/moz.build
toolkit/library/libxul.mk
toolkit/library/moz.build
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -1,14 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include $(topsrcdir)/toolkit/library/libxul.mk
-
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 DUMP_SYMBOLS_FLAGS = --count-ctors
 
 ifdef CLANG_CL
 ifdef MOZ_PROFILE_ORDER_FILE
deleted file mode 100644
--- a/toolkit/library/gtest/Makefile.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/toolkit/library/libxul.mk
-
-include $(topsrcdir)/config/config.mk
--- a/toolkit/library/gtest/moz.build
+++ b/toolkit/library/gtest/moz.build
@@ -25,16 +25,25 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
     GENERATED_FILES += ['symverscript']
     GENERATED_FILES['symverscript'].script = '/build/gen_symverscript.py'
     GENERATED_FILES['symverscript'].inputs = ['../symverscript.in']
     GENERATED_FILES['symverscript'].flags = [
         'xul%s' % CONFIG['MOZILLA_SYMBOLVERSION']
     ]
     SYMBOLS_FILE = '!symverscript'
 
+# Generate GDB pretty printer-autoload files only on Linux. OSX's GDB is
+# too old to support Python pretty-printers; if this changes, we could
+# make this 'ifdef GNU_CC'.
+if CONFIG['OS_ARCH'] == 'Linux':
+    # Create a GDB Python auto-load file alongside the libxul shared library
+    # in the build directory.
+    DEFINES['topsrcdir'] = TOPSRCDIR
+    OBJDIR_PP_FILES.toolkit.library.gtest += ['../libxul.so-gdb.py.in']
+
 # This needs to come after static:xul to avoid things like libfallible coming
 # before StaticXULComponentStart.
 Libxul('xul-gtest-real',
        output_category=None if CONFIG['LINK_GTEST_DURING_COMPILE'] else 'gtest')
 
 DIRS += [
     'static',
 ]
deleted file mode 100644
--- a/toolkit/library/libxul.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXTRA_DEPS += $(topsrcdir)/toolkit/library/libxul.mk
-
-# Generate GDB pretty printer-autoload files only on Linux. OSX's GDB is
-# too old to support Python pretty-printers; if this changes, we could make
-# this 'ifdef GNU_CC'.
-ifeq (Linux,$(OS_ARCH))
-# Create a GDB Python auto-load file alongside the libxul shared library in
-# the build directory.
-PP_TARGETS += LIBXUL_AUTOLOAD
-LIBXUL_AUTOLOAD = $(topsrcdir)/toolkit/library/libxul.so-gdb.py.in
-LIBXUL_AUTOLOAD_FLAGS := -Dtopsrcdir=$(abspath $(topsrcdir))
-endif
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -345,11 +345,20 @@ if CONFIG['COMPILE_ENVIRONMENT']:
         GENERATED_FILES += ['symverscript']
         GENERATED_FILES['symverscript'].script = '/build/gen_symverscript.py'
         GENERATED_FILES['symverscript'].inputs = ['symverscript.in']
         GENERATED_FILES['symverscript'].flags = [
             'xul%s' % CONFIG['MOZILLA_SYMBOLVERSION']
         ]
         SYMBOLS_FILE = '!symverscript'
 
+    # Generate GDB pretty printer-autoload files only on Linux. OSX's GDB is
+    # too old to support Python pretty-printers; if this changes, we could
+    # make this 'ifdef GNU_CC'.
+    if CONFIG['OS_ARCH'] == 'Linux':
+        # Create a GDB Python auto-load file alongside the libxul shared library
+        # in the build directory.
+        DEFINES['topsrcdir'] = TOPSRCDIR
+        OBJDIR_PP_FILES.toolkit.library += ['libxul.so-gdb.py.in']
+
 # This library is entirely composed of Rust code, and needs to come after
 # all the C++ code so any possible C++ -> Rust calls can be resolved.
 USE_LIBS += ['gkrust']