Revert 226978 "Revert 226920 "Roll Clang 188423:191856.""

trunk/src/build/common.gypi

Index: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi	(revision 226993)
+++ trunk/src/build/common.gypi	(working copy)
@@ -3130,6 +3130,10 @@
                           '-fuse-ld=gold',
                           '-Wno-psabi',
                         ],
+                        'ldflags!': [
+                          # Clang does not support the following options.
+                          '-fuse-ld=gold',
+                        ],
                       }],
                     ],
                   }],
@@ -3214,6 +3218,12 @@
               # code generated by flex (used in angle) contains that keyword.
               # http://crbug.com/255186
               '-Wno-deprecated-register',
+
+              # TODO(hans): Remove once we've cleaned up the warnings.
+              '-Wno-unused-const-variable',
+
+              # This warns about auto_ptr<>, used in third-party code.
+              '-Wno-deprecated-declarations',
             ],
             'cflags!': [
               # Clang doesn't seem to know know this flag.
@@ -3917,6 +3927,12 @@
                 # code generated by flex (used in angle) contains that keyword.
                 # http://crbug.com/255186
                 '-Wno-deprecated-register',
+
+                # TODO(hans): Remove once we've cleaned up the warnings.
+                '-Wno-unused-const-variable',
+
+                # This warns about auto_ptr<>, used in third-party code.
+                '-Wno-deprecated-declarations',
               ],
             }],
             ['clang==1 and clang_use_chrome_plugins==1', {