From 14c8ce0e929dc0ac055f9531722b983294607b23 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 20 Aug 2014 22:19:16 +0300 Subject: [PATCH] update gyp flags, disable tcmalloc due symbol conflicts --- chromium-browser.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chromium-browser.spec b/chromium-browser.spec index ce68998..988d881 100644 --- a/chromium-browser.spec +++ b/chromium-browser.spec @@ -37,7 +37,7 @@ %bcond_with system_libvpx # system libvpx %bcond_without system_yasm # system yasm %bcond_without system_zlib # system zlib -%bcond_without tcmalloc # use tcmalloc +%bcond_with tcmalloc # use tcmalloc %bcond_without verbose # verbose build (V=1) %ifarch %{ix86} @@ -404,9 +404,10 @@ flags=" -Dusb_ids_path=$(pkg-config --variable usbids usbutils) \ -Dlinux_link_libpci=1 \ -Dlinux_link_libspeechd=1 -Dlibspeechd_h_prefix=speech-dispatcher/ \ - %{!?with_tcmalloc:-Dlinux_use_tcmalloc=0} \ + -Duse_allocator=%{!?with_tcmalloc:none}%{?with_tcmalloc:tcmalloc} \ %{?with_gps:-Dlinux_use_libgps=1 -Dlinux_link_libgps=1} \ - -Dlinux_use_gold_binary=0 \ + -Dlinux_use_bundled_binutils=0 \ + -Dlinux_use_bundled_gold=0 \ -Dlinux_use_gold_flags=0 \ -Dlogging_like_official_build=1 \ -Dgoogle_api_key=%{google_api_key} \ -- 2.44.0