Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 2ec42a280325d643b98fd051adcb71862f6d0189..0466f31a275cdc7d750be64b8556832db5d0269a 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -583,6 +583,14 @@ |
}, { |
'enable_settings_app%': 0, |
}], |
+ |
+ ['OS=="linux"', { # and target_arch=="arm" and chromeos==0', { |
iannucci
2012/12/07 23:54:06
I'm not sure I'm reading this right, but it looks
Sam Clegg
2012/12/08 00:03:12
Great catch. Thank you.
Done.
Do you happen to k
|
+ # Set some defaults for arm/linux chrome builds |
+ 'armv7%': 1, |
+ 'linux_breakpad%': 0, |
+ 'linux_use_tcmalloc%': 0, |
+ 'sysroot%': '<!(cd <(DEPTH)/arm-sysroot && pwd -P)', |
+ }], # OS=="linux" and target_arch=="arm" |
], |
# Set this to 1 to use the Google-internal file containing |
@@ -1214,7 +1222,6 @@ |
}], |
], |
}], # OS=="mac" |
- |
['OS=="win"', { |
'conditions': [ |
['component=="shared_library"', { |
@@ -2803,7 +2810,7 @@ |
# Don't enable multi-threaded linking for 32-bit targets as it |
# causes intermittent crashed on lucid32: http://crbug.com/161942 |
# TODO(sbc): remove this once gold bug is fixed |
- ['host_arch!="ia32"', { |
+ ['host_arch!="ia32" and host_arch!="arm"', { |
'ldflags': [ |
# Experimentation found that using four linking threads |
# saved ~20% of link time. |