diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 16:17:52 -0400 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2014-10-29 16:17:52 -0400 |
| commit | 36cd65e1ab232c3a876d7c10a366143a9546e2e7 (patch) | |
| tree | 791a5cc58456794c2e154a7d187fadcf55b426c7 /deps | |
| parent | 76e746d255dbc7f5e2f366f3d1857adb2ea87aea (diff) | |
| download | qtlocation-mapboxgl-36cd65e1ab232c3a876d7c10a366143a9546e2e7.tar.gz | |
patch gyp to allow common 'libraries' config for both osx and linux
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/gyp/pylib/gyp/generator/make.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deps/gyp/pylib/gyp/generator/make.py b/deps/gyp/pylib/gyp/generator/make.py index b6f766d554..0b515bccd3 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)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) +cmd_link = $(LINK.$(TOOLSET)) -Wl,--start-group $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(LD_INPUTS) $(LIBS) -Wl,--end-group # We support two kinds of shared objects (.so): # 1) shared_library, which is just bundling together many dependent libraries |