Reviewers: dcarney,
Message:
PTAL
Description:
Fix host compilation with clang for android.
BUG=
Please review this at https://codereview.chromium.org/980843002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+18, -20 lines):
M build/standalone.gypi
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': {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
