summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2013-06-27 20:53:44 +0200
committerZeno Albisser <zeno.albisser@digia.com>2013-07-01 07:49:27 +0200
commit34e798b4942620f81ad1386b6d0664ecbbb9a6b1 (patch)
treeb3e7a3225da7112f72c03c2718503c5fd9a80887
parent64075990611aa3b2b82937ee44a655dff11b3c05 (diff)
Disable tcmalloc on mac.
Change-Id: Ic261e5aa38b04632c019d577117e9fb205462d82 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rwxr-xr-xbuild/gyp_qtwebengine3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine
index 6c3f7c6aa..11889adbf 100755
--- a/build/gyp_qtwebengine
+++ b/build/gyp_qtwebengine
@@ -103,8 +103,9 @@ if __name__ == '__main__':
args.extend(['-I' + i for i in additional_include_files(args)])
# 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',):
- args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1'])
+ args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1', '-D', 'linux_use_tcmalloc=0'])
# There shouldn't be a circular dependency relationship between .gyp files,
# but in Chromium's .gyp files, on non-Mac platforms, circular relationships