commit a89d9e764ca915fcb1bba4b730be6f0a7044a6bb
author murgatroid99 <mlumish@google.com> Tue Oct 13 16:03:16 2015 -0700
committer murgatroid99 <mlumish@google.com> Tue Oct 13 16:03:16 2015 -0700
tree a7f7c5f6addcd22f2552d3c3889f82610a76390d
parent c52dfac9997d66a2f9d98df0bbb55984d988129e

Made build flags consistent in Node gcov build

binding.gyp

diff --git a/binding.gyp b/binding.gyp
index 392835c..6dcb2d0 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -54,6 +54,24 @@
     'include_dirs': [
       '.',
       'include'
+    ],
+    'conditions': [
+      ['OS != "win"', {
+        'conditions': [
+          ['config=="gcov"', {
+            'cflags': [
+              '-ftest-coverage',
+              '-fprofile-arcs',
+              '-O0'
+            ],
+            'ldflags': [
+              '-ftest-coverage',
+              '-fprofile-arcs'
+            ]
+          }
+         ]
+        ]
+      }],
     ]
   },
   'targets': [
@@ -278,22 +296,6 @@
         '-g'
       ],
       "conditions": [
-        ['OS != "win"', {
-          'conditions': [
-            ['config=="gcov"', {
-              'cflags': [
-                '-ftest-coverage',
-                '-fprofile-arcs',
-                '-O0'
-              ],
-              'ldflags': [
-                '-ftest-coverage',
-                '-fprofile-arcs'
-              ]
-            }
-           ]
-          ]
-        }],
         ['OS == "mac"', {
           'xcode_settings': {
             'MACOSX_DEPLOYMENT_TARGET': '10.9',

templates/binding.gyp.template

diff --git a/templates/binding.gyp.template b/templates/binding.gyp.template
index 50d0823..bfa6a56 100644
--- a/templates/binding.gyp.template
+++ b/templates/binding.gyp.template
@@ -56,6 +56,24 @@
       'include_dirs': [
         '.',
         'include'
+      ],
+      'conditions': [
+        ['OS != "win"', {
+          'conditions': [
+            ['config=="gcov"', {
+              'cflags': [
+                '-ftest-coverage',
+                '-fprofile-arcs',
+                '-O0'
+              ],
+              'ldflags': [
+                '-ftest-coverage',
+                '-fprofile-arcs'
+              ]
+            }
+           ]
+          ]
+        }],
       ]
     },
     'targets': [
@@ -95,22 +113,6 @@
           '-g'
         ],
         "conditions": [
-          ['OS != "win"', {
-            'conditions': [
-              ['config=="gcov"', {
-                'cflags': [
-                  '-ftest-coverage',
-                  '-fprofile-arcs',
-                  '-O0'
-                ],
-                'ldflags': [
-                  '-ftest-coverage',
-                  '-fprofile-arcs'
-                ]
-              }
-             ]
-            ]
-          }],
           ['OS == "mac"', {
             'xcode_settings': {
               'MACOSX_DEPLOYMENT_TARGET': '10.9',