Index: build/common.gypi |
=================================================================== |
--- build/common.gypi (revision 146793) |
+++ build/common.gypi (working copy) |
@@ -511,6 +511,9 @@ |
['OS!="mac" and OS!="android"', { |
'use_canvas_skia%': 1, |
}], |
+ ['asan==1 or tsan==1', { |
Craig
2012/07/16 15:33:07
There's other stuff around line 1140 that sets cla
Alexander Potapenko
2012/07/16 15:39:29
I'm trying to do so, but undefined variables appea
|
+ 'clang%': 1, |
+ }], |
], |
}, |
@@ -843,12 +846,16 @@ |
'directx_sdk_path%': '$(DXSDK_DIR)', |
}], |
['os_posix==1 and OS!="mac" and OS!="ios"', { |
- # This will set gcc_version to XY if you are running gcc X.Y.*. |
- # This is used to tweak build flags for gcc 4.4. |
- 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', |
# Figure out the python architecture to decide if we build pyauto. |
'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/<(system_libdir)/libpython<(python_ver).so.1.0)', |
'conditions': [ |
+ ['clang==0', { |
+ # This will set gcc_version to XY if you are running gcc X.Y.*. |
+ # This is used to tweak build flags for gcc 4.4. |
Craig
2012/07/16 15:33:07
This appears only to be used in one spot for gcc 4
|
+ 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)', |
+ }, { |
+ 'gcc_version%': 0, |
+ }], |
['branding=="Chrome"', { |
'linux_breakpad%': 1, |
}], |