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

Unified Diff: build/common.gypi

Issue 11280181: An option and a tentative fix for 32-bit Clang build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 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
« 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/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index c999841ff46fa26ffc37d9d40f64c30e049a6c81..fcff8bf91bb4a8ed3aead6d73a950c3c28672812 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1434,7 +1434,18 @@
['OS=="linux" and clang_type_profiler==1', {
'clang%': 1,
'clang_use_chrome_plugins%': 0,
- 'make_clang_dir%': 'third_party/llvm-allocated-type/Linux_x64',
+ 'conditions': [
+ ['host_arch=="x64"', {
+ 'make_clang_dir%': 'third_party/llvm-allocated-type/Linux_x64',
+ }],
+ ['host_arch=="ia32"', {
+ # 32-bit Clang is unsupported. It may not build. Put your 32-bit
+ # Clang in this directory at your own risk if needed for some
+ # purpose (e.g. to compare 32-bit and 64-bit behavior like memory
+ # usage). Any failure by this compiler should not close the tree.
+ 'make_clang_dir%': 'third_party/llvm-allocated-type/Linux_ia32',
+ }],
+ ],
}],
# On valgrind bots, override the optimizer settings so we don't inline too
@@ -1620,6 +1631,11 @@
'<(DEPTH)/base/allocator/allocator.gyp:type_profiler',
],
}],
+ ['OS=="linux" and clang==1 and host_arch=="ia32"', {
+ # TODO(dmikurube): Remove -Wno-sentinel when Clang/LLVM is fixed.
+ # See http://crbug.com/162818.
+ 'cflags+': ['-Wno-sentinel'],
+ }],
['OS=="win" and "<(msbuild_toolset)"!=""', {
'msbuild_toolset': '<(msbuild_toolset)',
}],
« 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