build: fix c++ code coverage on macOS

refack · BethGriggs · commit c57008e5499c · 2019-02-12T15:33:48.000Z
PR-URL: #24520 Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/node.gypi b/node.gypi
@@ -269,25 +269,28 @@
                    '-Wl,--whole-archive <(v8_base)',
                    '-Wl,--no-whole-archive' ]
     }],
-    [ 'OS in "mac freebsd linux" and node_shared=="false"'
-        ' and coverage=="true"', {
+    [ 'coverage=="true" and node_shared=="false" and OS in "mac freebsd linux"', {
+      'cflags!': [ '-O3' ],
       'ldflags': [ '--coverage',
                    '-g',
                    '-O0' ],
       'cflags': [ '--coverage',
                    '-g',
                    '-O0' ],
-      'cflags!': [ '-O3' ],
       'xcode_settings': {
-        'OTHER_LDFLAGS': [
-          '--coverage',
-        ],
-        'OTHER_CFLAGS+': [
+        'OTHER_CFLAGS': [
           '--coverage',
           '-g',
           '-O0'
         ],
-      }
+      },
+      'conditions': [
+        [ '_type=="executable"', {
+          'xcode_settings': {
+            'OTHER_LDFLAGS': [ '--coverage', ],
+          },
+        }],
+      ],
     }],
     [ 'OS=="sunos"', {
       'ldflags': [ '-Wl,-M,/usr/lib/ld/map.noexstk' ],
