From 9342a97739763691dd1a346a6d9e5af319af0d95 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 29 Jul 2017 17:45:29 +0200 Subject: See through utility libraries in Windows rpath emulation code --- build2/cc/windows-rpath.cxx | 18 ++++++++++-------- 1 file 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 ()) || - (f = pt->is_a ())) + if ((a = (f = pt->is_a ())) || + (a = (f = pt->is_a ())) || // See through. + ( f = pt->is_a ())) 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 ()) || - (f = pt->is_a ())) + if ((a = (f = pt->is_a ())) || + (a = (f = pt->is_a ())) || // See through. + ( f = pt->is_a ())) process_libraries (act, bs, li, sys_lib_dirs, - *f, a != nullptr, pt.data, + *f, a, pt.data, imp, lib, nullptr, true); } -- cgit v1.1