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

Unified Diff: tools.gyp

Issue 12499011: Use gcc by default for gyp untrusted ARM builds (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: fix irt_core_build Created 7 years, 9 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 | « src/untrusted/irt/irt.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools.gyp
diff --git a/tools.gyp b/tools.gyp
index a5daf082ddac6a134cc219bfc93f8d8a9e559d5d..f79931fb2d8aad91f92d186963f79468943e8bb6 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -35,7 +35,7 @@
'crt_fini_64',
],
}],
- ['target_arch=="arm" and nacl_enable_arm_gcc!=0', {
+ ['target_arch=="arm"', {
'dependencies': [
'crt_init_arm',
'crt_fini_arm',
@@ -122,7 +122,7 @@
},
]
}],
- ['target_arch=="arm" and nacl_enable_arm_gcc!=0 and disable_arm==0 and disable_arm_untar==0', {
+ ['target_arch=="arm" and disable_arm==0 and disable_arm_untar==0', {
'actions': [
{
'action_name': 'Untar arm toolchain',
@@ -206,7 +206,7 @@
},
]
}],
- ['target_arch=="arm" and nacl_enable_arm_gcc!=0 and disable_arm==0', {
+ ['target_arch=="arm" and disable_arm==0', {
'actions': [
{
'action_name': 'Prep arm toolchain',
@@ -366,7 +366,7 @@
}
],
}],
- ['target_arch=="arm" and nacl_enable_arm_gcc!=0', {
+ ['target_arch=="arm"', {
'targets' : [
{
'target_name': 'crt_init_arm',
« no previous file with comments | « src/untrusted/irt/irt.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698