diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-29 17:45:29 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-29 17:52:48 +0200 |
| commit | 9342a97739763691dd1a346a6d9e5af319af0d95 (patch) | |
| tree | 4a4e1aaa3f352299e60f2f5101f9db9fe5bcafdc | |
| parent | 7cd2c81a93aee9b19205f816bb475f82d9dbdea6 (diff) | |
See through utility libraries in Windows rpath emulation code
| -rw-r--r-- | build2/cc/windows-rpath.cxx | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx index 6c8dd16..0cc8246 100644 --- a/build2/cc/windows-rpath.cxx +++ b/build2/cc/windows-rpath.cxx @@ -107,13 +107,14 @@ namespace build2 if (pt == nullptr) continue; + bool a; const file* f; - const liba* a; - if ((f = a = pt->is_a<liba> ()) || - (f = pt->is_a<libs> ())) + if ((a = (f = pt->is_a<liba> ())) || + (a = (f = pt->is_a<libux> ())) || // See through. + ( f = pt->is_a<libs> ())) process_libraries (act, bs, li, sys_lib_dirs, - *f, a != nullptr, pt.data, + *f, a, pt.data, imp, lib, nullptr, true); } @@ -192,13 +193,14 @@ namespace build2 if (pt == nullptr) continue; + bool a; const file* f; - const liba* a; - if ((f = a = pt->is_a<liba> ()) || - (f = pt->is_a<libs> ())) + if ((a = (f = pt->is_a<liba> ())) || + (a = (f = pt->is_a<libux> ())) || // See through. + ( f = pt->is_a<libs> ())) process_libraries (act, bs, li, sys_lib_dirs, - *f, a != nullptr, pt.data, + *f, a, pt.data, imp, lib, nullptr, true); } |