diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-12 21:26:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 21:26:09 +0300 |
| commit | 1944a7a66d594b60eea32f76e049810d8adb0ed5 (patch) | |
| tree | 104481bbbb8e1661718a1492f7b5ef0ffa88c6da /mesonbuild/backend/vs2010backend.py | |
| parent | da64da3617f5327e4db866daf77668477ddb5e77 (diff) | |
| parent | 1865425b4bbf87f9198353dd730de748680d3979 (diff) | |
| download | meson-1944a7a66d594b60eea32f76e049810d8adb0ed5.zip meson-1944a7a66d594b60eea32f76e049810d8adb0ed5.tar.gz meson-1944a7a66d594b60eea32f76e049810d8adb0ed5.tar.bz2 | |
Merge pull request #1932 from centricular/fix-libpath-reordering
Preserve -L -l pairings fetched from external deps
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index d4a7a19..57b0437 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -908,11 +908,13 @@ class Vs2010Backend(backends.Backend): extra_link_args += target.link_args # External deps must be last because target link libraries may depend on them. for dep in target.get_external_deps(): - extra_link_args += dep.get_link_args() + # Extend without reordering or de-dup to preserve `-L -l` sets + # https://github.com/mesonbuild/meson/issues/1718 + extra_link_args.extend_direct(dep.get_link_args()) for d in target.get_dependencies(): if isinstance(d, build.StaticLibrary): for dep in d.get_external_deps(): - extra_link_args += dep.get_link_args() + extra_link_args.extend_direct(dep.get_link_args()) # Add link args for c_* or cpp_* build options. Currently this only # adds c_winlibs and cpp_winlibs when building for Windows. This needs # to be after all internal and external libraries so that unresolved |