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

Unified Diff: build/common.gypi

Issue 379693003: Hotfix to make clang-by-default work with gcc 4.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 44ef70aa8d9303ec53b65c55a2818808c5aa1489..8e09b007ec1403f12786369637f109e957d0a739 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4181,7 +4181,7 @@
# gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Options.html
# TODO(mithro): Watch for clang support at following thread:
# http://clang-developers.42468.n3.nabble.com/Adding-fuse-ld-support-to-clang-td4032180.html
- ['gcc_version>=48', {
+ ['gcc_version>=48 and clang==0', {
'target_conditions': [
['_toolset=="target"', {
'ldflags': [
@@ -4190,7 +4190,7 @@
}],
],
}],
- ['host_gcc_version>=48', {
+ ['host_gcc_version>=48 and clang==0', {
'target_conditions': [
['_toolset=="host"', {
'ldflags': [
@@ -4228,7 +4228,7 @@
'-Wl,--disable-new-dtags',
],
}],
- ['gcc_version>=48', {
+ ['gcc_version>=48 and clang==0', {
'target_conditions': [
['_toolset=="target"', {
'cflags_cc': [
@@ -4241,7 +4241,7 @@
}],
],
}],
- ['host_gcc_version>=48', {
+ ['host_gcc_version>=48 and clang==0', {
'target_conditions': [
['_toolset=="host"', {
'cflags_cc': [
@@ -5475,7 +5475,7 @@
# Don't warn about the "typedef 'foo' locally defined but not used"
# for gcc 4.8.
# TODO: remove this flag once all builds work. See crbug.com/227506
- ['gcc_version>=48', {
+ ['gcc_version>=48 and clang==0', {
'target_defaults': {
'cflags': [
'-Wno-unused-local-typedefs',
« 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