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 /storage/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 'storage/moz.build')
| -rw-r--r-- | storage/moz.build | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/moz.build b/storage/moz.build index 8863105c9..216a1cf74 100644 --- a/storage/moz.build +++ b/storage/moz.build @@ -98,8 +98,7 @@ FINAL_LIBRARY = 'xul' # Note: On Windows our sqlite build assumes we use jemalloc. If you disable # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in. -if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_SYSTEM_SQLITE'] - or CONFIG['MOZ_SYSTEM_JEMALLOC']): +if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_SYSTEM_SQLITE']: if CONFIG['OS_TARGET'] != 'Android': DEFINES['MOZ_STORAGE_MEMORY'] = True |