diff options
author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-28 17:55:46 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-28 17:57:05 +0200 |
commit | b53db93006f732fb2e140137e4713dedca1700d9 (patch) | |
tree | a2c1817c0fa6dd40d7da600148db70566e3a359d /memory/mozjemalloc/moz.build | |
parent | db4b6dc1dab3dd099c93253b96fbe8089c2f9e60 (diff) | |
parent | f7b98c15a1c0a458b4bfa420f1743c8abfbdf7a8 (diff) | |
download | UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.gz UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.lz UXP-b53db93006f732fb2e140137e4713dedca1700d9.tar.xz UXP-b53db93006f732fb2e140137e4713dedca1700d9.zip |
Merge branch 'malloc-rewrite'
This resolves #263.
Diffstat (limited to 'memory/mozjemalloc/moz.build')
-rw-r--r-- | memory/mozjemalloc/moz.build | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/memory/mozjemalloc/moz.build b/memory/mozjemalloc/moz.build index 0660d1300..feeb4fb07 100644 --- a/memory/mozjemalloc/moz.build +++ b/memory/mozjemalloc/moz.build @@ -8,16 +8,15 @@ EXPORTS += [ 'jemalloc_types.h', ] -if not CONFIG['MOZ_JEMALLOC4']: - SOURCES += [ - 'jemalloc.c', - ] - FINAL_LIBRARY = 'memory' - - # See bug 422055. - if CONFIG['OS_ARCH'] == 'SunOS' and not CONFIG['GNU_CC'] \ - and CONFIG['MOZ_OPTIMIZE']: - CFLAGS += ['-xO5'] +SOURCES += [ + 'jemalloc.c', +] +FINAL_LIBRARY = 'memory' + +# See bug 422055. +if CONFIG['OS_ARCH'] == 'SunOS' and not CONFIG['GNU_CC'] \ + and CONFIG['MOZ_OPTIMIZE']: + CFLAGS += ['-xO5'] # For non release/esr builds, enable (some) fatal jemalloc assertions. This # helps us catch memory errors. |