| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index da571a965ef882527029b9c91ddf3254189f369b..06ff528b8e77a47c100f2440c3ad80c0289aa10b 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -667,8 +667,8 @@
|
| ],
|
| }],
|
| ['target_arch=="arm"', {
|
| - 'conditions': [
|
| - ['armv7==1', {
|
| + 'target_conditions': [
|
| + ['armv7==1 and _toolset=="target"', {
|
| 'cflags': [
|
| '-march=armv7-a',
|
| '-mtune=cortex-a8',
|
| @@ -679,12 +679,15 @@
|
| ],
|
| }],
|
| ['sysroot!=""', {
|
| - 'cflags': [
|
| - '--sysroot=<(sysroot)',
|
| - ],
|
| - 'ldflags': [
|
| - '--sysroot=<(sysroot)',
|
| - ],
|
| + 'target_conditions': [
|
| + ['_toolset=="target"', {
|
| + 'cflags': [
|
| + '--sysroot=<(sysroot)',
|
| + ],
|
| + 'ldflags': [
|
| + '--sysroot=<(sysroot)',
|
| + ],
|
| + }]]
|
| }],
|
| ['no_strict_aliasing==1', {
|
| 'cflags': [
|
|
|