A64: Synchronize with r15358.

build/standalone.gypi

Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 88fad7414e0b2b5c28ef966091765d083eec8f1c..a52c8946fadfd89bf6509f802f8f965b1183d607 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -103,8 +103,8 @@
        or OS=="netbsd"', {
       'target_defaults': {
         'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
-                    '-Wnon-virtual-dtor', '-pthread', '-fno-rtti',
-                    '-fno-exceptions', '-pedantic' ],
+                    '-pthread', '-fno-exceptions', '-pedantic' ],
+        'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti' ],
         'ldflags': [ '-pthread', ],
         'conditions': [
           [ 'OS=="linux"', {
@@ -203,6 +203,7 @@
           'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',    # -Werror
           'GCC_VERSION': 'com.apple.compilers.llvmgcc42',
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',  # -Wnewline-eof
+          'GCC_WARN_NON_VIRTUAL_DESTRUCTOR': 'YES', # -Wnon-virtual-dtor
           # MACOSX_DEPLOYMENT_TARGET maps to -mmacosx-version-min
           'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
           'PREBINDING': 'NO',                       # No -Wl,-prebind
@@ -216,7 +217,6 @@
             '-Wendif-labels',
             '-W',
             '-Wno-unused-parameter',
-            '-Wnon-virtual-dtor',
           ],
         },
         'target_conditions': [