Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Unified Diff: build/common.gypi

Issue 265031: linux: Chrome-side gyp changes for cross-compile (Closed)
Patch Set: . Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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': [
« no previous file with comments | « no previous file | build/linux/system.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698