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

Unified Diff: build/common.gypi

Issue 140653005: Adds tls_edit utility which patches irt_core.nexe's TLS usage. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: gyp builds with host toolsets should not inherit target flags for arm and mips Created 6 years, 11 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
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index d53c6e6bffb182696eda85c1361b84edcf55359d..01ca89abeba40983458b057d3db09dea71d816b7 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -302,48 +302,56 @@
],
}],
[ 'target_arch=="arm"', {
- 'cflags': [
- '-Wno-abi',
- '-fno-exceptions',
- '-Wall',
- '-fPIC',
- '--sysroot=<(sysroot)',
- ],
- 'ldflags': [
- '--sysroot=<(sysroot)',
- ],
- # TODO(mcgrathr): This is copied from the arm section of
- # chromium/src/build/common.gypi, but these details really
- # should be more fully harmonized and shared.
- 'conditions': [
- ['arm_thumb==1', {
- 'cflags': [
- '-mthumb',
- ]
- }],
- ['arm_version==7', {
- 'cflags': [
- '-march=armv7-a',
- '-mtune=cortex-a9',
- '-mfloat-abi=<(arm_float_abi)',
- ],
- 'conditions': [
- ['arm_neon==1', {
- 'cflags': [ '-mfpu=neon', ],
- }, {
- 'cflags': [ '-mfpu=<(arm_fpu)', ],
- }]
- ],
- }],
+ 'target_conditions': [
+ ['_toolset=="target"', {
+ 'cflags': [
+ '-Wno-abi',
+ '-fno-exceptions',
+ '-Wall',
+ '-fPIC',
+ '--sysroot=<(sysroot)',
+ ],
+ 'ldflags': [
+ '--sysroot=<(sysroot)',
+ ],
+ # TODO(mcgrathr): This is copied from the arm section of
+ # chromium/src/build/common.gypi, but these details really
+ # should be more fully harmonized and shared.
+ 'conditions': [
+ ['arm_thumb==1', {
+ 'cflags': [
+ '-mthumb',
+ ]
+ }],
+ ['arm_version==7', {
+ 'cflags': [
+ '-march=armv7-a',
+ '-mtune=cortex-a9',
+ '-mfloat-abi=<(arm_float_abi)',
+ ],
+ 'conditions': [
+ ['arm_neon==1', {
+ 'cflags': [ '-mfpu=neon', ],
+ }, {
+ 'cflags': [ '-mfpu=<(arm_fpu)', ],
+ }]
+ ],
+ }],
+ ],
+ }],
],
}],
['target_arch=="mipsel"', {
- # Copied from chromium build/common.gypi
- 'conditions': [
- ['mips_arch_variant=="mips32r2"', {
- 'cflags': ['-mips32r2'],
- }, {
- 'cflags': ['-mips32'],
+ 'target_conditions': [
+ ['_toolset=="target"', {
+ # Copied from chromium build/common.gypi
+ 'conditions': [
+ ['mips_arch_variant=="mips32r2"', {
+ 'cflags': ['-mips32r2'],
+ }, {
+ 'cflags': ['-mips32'],
+ }],
+ ],
}],
],
}],

Powered by Google App Engine
This is Rietveld 408576698