diff options
| -rw-r--r-- | src/core/qtwebengine.gypi | 6 | ||||
| -rwxr-xr-x | tools/buildscripts/gyp_qtwebengine | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 0a179ea26..801b8926d 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -95,12 +95,6 @@ '<(chromium_src_dir)/build/linux/system.gyp:fontconfig', ], }], - ['os_posix==1 and linux_use_tcmalloc==1', { - 'dependencies': [ - # This is needed by content/app/content_main_runner.cc - '<(chromium_src_dir)/base/allocator/allocator.gyp:allocator', - ], - }], ['use_aura==1', { 'dependencies': [ '<(chromium_src_dir)/ui/aura/aura.gyp:aura', diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine index 12a6427d8..12eae72c6 100755 --- a/tools/buildscripts/gyp_qtwebengine +++ b/tools/buildscripts/gyp_qtwebengine @@ -96,10 +96,14 @@ if __name__ == '__main__': args.extend(['-I' + i for i in additional_include_files(args)]) + # We always have to disable tcmalloc. + # Allocating with tcmalloc in chromium code and freeing without + # tcmalloc outside of chromium code would cause erratic behavior. + args.extend(['-D', 'linux_use_tcmalloc=0']) + # On Mac we want to build in x64 mode. And we want to use libc++. - # Even though we are not on linux, it seems we specifically have to disable linux_use_tcmalloc. if sys.platform in ('darwin',) and not 'GYP_CROSSCOMPILE' in os.environ: - args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1', '-D', 'linux_use_tcmalloc=0']) + args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1']) # There shouldn't be a circular dependency relationship between .gyp files, # but in Chromium's .gyp files, on non-Mac platforms, circular relationships |