[gyp] Coverage only if BUILDTYPE=Debug and ENABLE_COVERAGE=1

Coverage compiler and linker flags are used only when (1) in debug build
and (2) with ENABLE_COVERAGE set to 1. Besides, because OS X's libtool
is unable to understand '--coverage', this linker flag is only used
genrating executable targets. Also, using 'link_settings' to specify
linker options and separate instructions for OSX and Linux.

1 files changed, 11 insertions, 15 deletions

diff --git a/platform/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi
index 19c17f6249..a2c61e9d3b 100644
--- a/platform/linux/mapboxgl-app.gypi
+++ b/platform/linux/mapboxgl-app.gypi
@@ -39,31 +39,27 @@
 
       'conditions': [
         ['OS == "mac"', {
-          'libraries': [ '<@(libraries)' ],
           'xcode_settings': {
             'SDKROOT': 'macosx',
             'SUPPORTED_PLATFORMS':'macosx',
             'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
-            'OTHER_LDFLAGS': [ '<@(ldflags)' ],
-            'SDKROOT': 'macosx',
             'MACOSX_DEPLOYMENT_TARGET': '10.10',
           },
-          'configurations': {
-            'Debug': {
-              'xcode_settings': {
-                'conditions': [
-                  ['enable_coverage=="1"', {
-                    'OTHER_LDFLAGS': [ '--coverage' ],
-                  }],
-                ],
-              },
-            },
-          },
         }, {
           'cflags_cc': [ '<@(cflags_cc)' ],
-          'libraries': [ '<@(libraries)', '<@(ldflags)' ],
         }]
       ],
+
+      'link_settings': {
+        'conditions': [
+          ['OS == "mac"', {
+            'libraries': [ '<@(libraries)' ],
+            'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] }
+          }, {
+            'libraries': [ '<@(libraries)', '<@(ldflags)' ],
+          }]
+        ],
+      },
     },
   ],
 }