From 2fd22b874231399d9060c07930d4eb5dde941e2b Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Mon, 13 Apr 2015 18:18:07 +0200 Subject: [PATCH] define MACOSX_DEPLOYMENT_TARGET in common.gypi Needed in target_defaults to prevent node-gyp from overriding this everywhere with '10.5' from https://github.com/joyent/node/blob/master/common.gypi --- gyp/common.gypi | 1 + macosx/mapboxgl-app.gyp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gyp/common.gypi b/gyp/common.gypi index 01f1451dd..fbfa68711 100644 --- a/gyp/common.gypi +++ b/gyp/common.gypi @@ -23,6 +23,7 @@ ], 'GCC_WARN_PEDANTIC': 'YES', 'GCC_WARN_UNINITIALIZED_AUTOS': 'YES_AGGRESSIVE', + 'MACOSX_DEPLOYMENT_TARGET': '10.9', }, }, { 'cflags_cc': [ diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp index 39aef6435..9817f9d97 100644 --- a/macosx/mapboxgl-app.gyp +++ b/macosx/mapboxgl-app.gyp @@ -54,7 +54,6 @@ 'OTHER_LDFLAGS': [ '<@(ldflags)' ], 'SDKROOT': 'macosx', 'INFOPLIST_FILE': 'Info.plist', - 'MACOSX_DEPLOYMENT_TARGET': '10.9', 'CLANG_ENABLE_OBJC_ARC': 'YES' }, }