summaryrefslogtreecommitdiff
path: root/chromium/base
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-04-28 16:33:06 +0200
committerAndras Becsi <andras.becsi@digia.com>2014-04-28 18:10:03 +0200
commita6a44c1dcae097eeac597b688fb6b08d35188553 (patch)
treeedd817f4412f3444e9947c9639300dbab28e626a /chromium/base
parent49b14687697af2240bf5122647537232aaf604f7 (diff)
downloadqtwebengine-chromium-a6a44c1dcae097eeac597b688fb6b08d35188553.tar.gz
Include atomicops_internals_x86_gcc.cc when compiling for ia32
This is needed for the embedded emulators and should be squashed with the corresponding patch on the next update. Change-Id: I9ece131df6ba23045dad741278651399a67639e7 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/base')
-rw-r--r--chromium/base/base.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
index 26aacafcae2..45d71802744 100644
--- a/chromium/base/base.gypi
+++ b/chromium/base/base.gypi
@@ -729,6 +729,11 @@
['include', '^nix/'],
],
}],
+ ['use_qt==1 and target_arch=="ia32"', {
+ 'sources/': [
+ ['include', 'atomicops_internals_x86_gcc.cc'],
+ ],
+ }],
['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
'sources!': [
'message_loop/message_pump_glib.cc',