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

Unified Diff: build/standalone.gypi

Issue 980843002: Fix host compilation with clang for android. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 10 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index e09952b1fff8be92bc6530506ba06675745f0e89..3f7e3c630d11a2e84977b62038bd16f12556fb85 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -334,26 +334,6 @@
}],
],
},
- 'conditions': [
- ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"', {
- 'make_global_settings': [
- ['CC.host', '../<(clang_dir)/bin/clang'],
- ['CXX.host', '../<(clang_dir)/bin/clang++'],
- ],
- }],
- ['clang==0 and host_clang==1', {
- 'target_conditions': [
- ['_toolset=="host"', {
- 'cflags_cc': [ '-std=gnu++11', ],
- }],
- ],
- 'target_defaults': {
- 'target_conditions': [
- ['_toolset=="host"', { 'cflags!': [ '-Wno-unused-local-typedefs' ]}],
- ],
- },
- }],
- ],
}],
# 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
# or OS=="netbsd"'
@@ -529,6 +509,24 @@
], # target_conditions
}, # target_defaults
}], # OS=="mac"
+ ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"', {
+ 'make_global_settings': [
+ ['CC.host', '../<(clang_dir)/bin/clang'],
+ ['CXX.host', '../<(clang_dir)/bin/clang++'],
+ ],
+ }],
+ ['clang==0 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"', {
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ 'cflags_cc': [ '-std=gnu++11', ],
+ }],
+ ],
+ 'target_defaults': {
+ 'target_conditions': [
+ ['_toolset=="host"', { 'cflags!': [ '-Wno-unused-local-typedefs' ]}],
+ ],
+ },
+ }],
['clang==1 and "<(GENERATOR)"=="ninja"', {
# See http://crbug.com/110262
'target_defaults': {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698