From eb6741b15ebd93ffdd71e87cbc1350b9e94ef222 Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Tue, 20 Nov 2018 11:26:48 -0500
Subject: build: fix c++ code coverage on macOS

PR-URL: https://github.com/nodejs/node/pull/24520
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 node.gypi | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'node.gypi')

diff --git a/node.gypi b/node.gypi
index fdf81b7465..665fc627b3 100644
--- a/node.gypi
+++ b/node.gypi
@@ -274,25 +274,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' ],
-- 
cgit v1.2.3