diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 19:37:42 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 19:37:42 -0400 |
| commit | b32748b42f6c9ec8d336f4571f6278a2eeeebae0 (patch) | |
| tree | 2cba901c52f426ba9709140fdc14b76003397805 | |
| parent | ad6d73e6b007dde53095209a8695cabfad9feb22 (diff) | |
| download | qtlocation-mapboxgl-b32748b42f6c9ec8d336f4571f6278a2eeeebae0.tar.gz | |
better fix for handling mbgl-linux symbols
| -rw-r--r-- | deps/gyp/pylib/gyp/generator/make.py | 2 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gyp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/deps/gyp/pylib/gyp/generator/make.py b/deps/gyp/pylib/gyp/generator/make.py index 0b515bccd3..7a8adb5850 100644 --- a/deps/gyp/pylib/gyp/generator/make.py +++ b/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 diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index b8062829a1..027612cbd4 100644 --- a/linux/mapboxgl-app.gyp +++ b/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)', |