Skip to content

Commit

Permalink
Bug 1142403 - Part 1: Don't build jemalloc4 with unified sources when…
Browse files Browse the repository at this point in the history
… built with --enable-debug. r=mshal

When built with --enable-debug, jemalloc4 makes headers define functions that
are normally inlined, and that prevents unified sources from working.

--HG--
extra : rebase_source : 9490a0a8312e9be18e639384e3450a9c924e3daf
extra : source : a67867200ec31a040bb6bf8320bde20beb34aa3e
  • Loading branch information
glandium committed Aug 12, 2015
1 parent 231f3c3 commit bbde532
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions memory/jemalloc/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@
# 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/.

UNIFIED_SOURCES += [
# When built with --enable-debug, jemalloc4 makes headers define functions that
# are normally inlined, and that prevents unified sources from working.
if CONFIG['MOZ_DEBUG']:
maybe_unified_sources = SOURCES
else:
maybe_unified_sources = UNIFIED_SOURCES

maybe_unified_sources += [
'src/src/arena.c',
'src/src/atomic.c',
'src/src/base.c',
Expand Down Expand Up @@ -42,7 +49,7 @@ SOURCES += [
# Only OSX needs the zone allocation implementation,
# but only if replace-malloc is not enabled.
if CONFIG['OS_TARGET'] == 'Darwin' and not CONFIG['MOZ_REPLACE_MALLOC']:
UNIFIED_SOURCES += [
maybe_unified_sources += [
'src/src/zone.c',
]

Expand Down

0 comments on commit bbde532

Please sign in to comment.