1 files changed, 24 insertions, 23 deletions
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index 39a1755569..a09f3d963e 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -4,28 +4,36 @@
       'product_name': 'mbgl-linux',
       'type': 'static_library',
       'hard_dependency': 1,
-      'include_dirs': [
-        '../include'
-      ],
+      'variables': {
+        'cflags_cc': [
+          '<@(uv_cflags)',
+          '<@(curl_cflags)',
+        ],
+        'ldflags': [
+          '<@(uv_ldflags)',
+          '<@(curl_ldflags)',
+        ],
+      },
       'sources': [
         '../platform/default/cache_database_tmp.cpp',
         '../platform/default/log_stderr.cpp',
         '../platform/default/string_stdlib.cpp',
         '../platform/default/http_request_baton_curl.cpp',
       ],
+      'include_dirs': [
+        '../include',
+      ],
+      'libraries': [
+        '<@(uv_static_libs)',
+        '<@(curl_static_libs)',
+      ],
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS': [
-              '<@(uv_cflags)',
-              '<@(curl_cflags)',
-            ],
+            'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
           }
         }, {
-          'cflags': [
-            '<@(uv_cflags)',
-            '<@(curl_cflags)',
-          ],
+          'ldflags': [ '<@(ldflags)' ],
         }]
       ],
       'direct_dependent_settings': {
@@ -35,20 +43,13 @@
         'conditions': [
           ['OS == "mac"', {
             'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '<@(uv_libraries)',
-                '<@(curl_libraries)',
-              ]
+              'OTHER_LDFLAGS': [ '<@(ldflags)' ],
             }
           }, {
-            'libraries': [
-              '<@(uv_libraries)',
-              '<@(curl_libraries)',
-              '-lboost_regex',
-            ]
+            'ldflags': [ '<@(ldflags)' ],
           }]
-        ]
-      }
+        ],
+      },
     },
-  ]
+  ],
 }