Bug 806819 - Part 1: Remove FORCE_PR_LOG unified build restriction. r=gps
☠☠ backed out by b92b206a2760 ☠ ☠
authorEric Rahm <erahm@mozilla.com>
Mon, 06 Oct 2014 13:06:55 -0700
changeset 209046 70a167982c3fa283e32e7b1c78cf6c974cb70af8
parent 209045 5399c9620878d218448cd258051ace5f48d36351
child 209047 e25a2a8d4af4a0c8f2d1c6cdf0eb48392d35ce68
push id50070
push usererahm@mozilla.com
push dateMon, 06 Oct 2014 22:09:16 +0000
treeherdermozilla-inbound@009ae35b0c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs806819
milestone35.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 806819 - Part 1: Remove FORCE_PR_LOG unified build restriction. r=gps
python/mozbuild/mozbuild/backend/recursivemake.py
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -641,21 +641,16 @@ class RecursiveMakeBackend(CommonBackend
                         "#endif")
                 includeTemplate += (
                     '\n'
                     '#ifdef PL_ARENA_CONST_ALIGN_MASK\n'
                     '#error "%(cppfile)s uses PL_ARENA_CONST_ALIGN_MASK, '
                     'so it cannot be built in unified mode."\n'
                     '#undef PL_ARENA_CONST_ALIGN_MASK\n'
                     '#endif\n'
-                    '#ifdef FORCE_PR_LOG\n'
-                    '#error "%(cppfile)s forces NSPR logging, '
-                    'so it cannot be built in unified mode."\n'
-                    '#undef FORCE_PR_LOG\n'
-                    '#endif\n'
                     '#ifdef INITGUID\n'
                     '#error "%(cppfile)s defines INITGUID, '
                     'so it cannot be built in unified mode."\n'
                     '#undef INITGUID\n'
                     '#endif')
                 f.write('\n'.join(includeTemplate % { "cppfile": s } for
                                   s in source_filenames))