better fix for handling mbgl-linux symbols

deps/gyp/pylib/gyp/generator/make.py

@@ -141,7 +141,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
 # special "figure out circular dependencies" flags around the entire
 # input list during linking.
 quiet_cmd_link = LINK($(TOOLSET)) $@
-cmd_link = $(LINK.$(TOOLSET)) -Wl,--start-group $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) -Wl,--end-group
+cmd_link = $(LINK.$(TOOLSET)) -Wl,--start-group $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) -Wl,--end-group $(LIBS)
 
 # We support two kinds of shared objects (.so):
 # 1) shared_library, which is just bundling together many dependent libraries

linux/mapboxgl-app.gyp

@@ -23,8 +23,6 @@
         '-I<(boost_root)/include',
       ],
       'libraries': [
-        '-L<(PRODUCT_DIR)/',
-        '-lmbgl-linux' # hack: double-linking to workaround lack of start/end group support for /path/to/libmbgl-linux with g++-4.8
         '<@(curl_static_libs)',
         '<@(png_ldflags)',
         '<@(sqlite3_ldflags)',