Index: build/common.gypi |
diff --git a/build/common.gypi b/build/common.gypi |
index 1d8d5af40fe75c498ddafecde2c0d086f495e1f8..0d7de665e68f1189988d186e6802ef23677dba79 100644 |
--- a/build/common.gypi |
+++ b/build/common.gypi |
@@ -3213,9 +3213,9 @@ |
}], |
# _FORTIFY_SOURCE isn't really supported by Clang now, see |
# http://llvm.org/bugs/show_bug.cgi?id=16821. |
- # TODO(glider): once the bug is fixed, disable source fortification |
- # under the sanitizer tools only. |
- ['os_posix==1 and (OS!="linux" or clang!=1)', { |
+ # It seems to work fine with Ubuntu 12 headers though, so use it |
+ # in official builds. |
+ ['os_posix==1 and (asan!=1 and msan!=1 and tsan!=1 and lsan!=1 and ubsan!=1) and (OS!="linux" or clang!=1 or buildtype=="Official")', { |
'target_conditions': [ |
['chromium_code==1', { |
# Non-chromium code is not guaranteed to compile cleanly |