diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-27 14:45:05 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-07-27 14:45:05 +0200 |
| commit | bf959a7fc119f9156c4b84c9d0a10900d9153f8d (patch) | |
| tree | d19b96238f58e305d936d186901edd1cf98e0c93 /build2/cc/windows-rpath.cxx | |
| parent | 24f74ea70a19ccd7bcb489853fc73a972ab8638f (diff) | |
Initial infrastructure for utility libraries
Diffstat (limited to 'build2/cc/windows-rpath.cxx')
| -rw-r--r-- | build2/cc/windows-rpath.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx index 450a0f5..1fc195a 100644 --- a/build2/cc/windows-rpath.cxx +++ b/build2/cc/windows-rpath.cxx @@ -49,7 +49,7 @@ namespace build2 windows_rpath_timestamp (const file& t, const scope& bs, action act, - lorder lo) const + linfo li) const { timestamp r (timestamp_nonexistent); @@ -109,7 +109,7 @@ namespace build2 if ((f = a = pt->is_a<liba> ()) || (f = pt->is_a<libs> ())) - process_libraries (act, bs, lo, sys_lib_dirs, + process_libraries (act, bs, li, sys_lib_dirs, *f, a != nullptr, imp, lib, nullptr, true); } @@ -124,7 +124,7 @@ namespace build2 windows_rpath_dlls (const file& t, const scope& bs, action act, - lorder lo) const -> windows_dlls + linfo li) const -> windows_dlls { windows_dlls r; @@ -191,7 +191,7 @@ namespace build2 if ((f = a = pt->is_a<liba> ()) || (f = pt->is_a<libs> ())) - process_libraries (act, bs, lo, sys_lib_dirs, + process_libraries (act, bs, li, sys_lib_dirs, *f, a != nullptr, imp, lib, nullptr, true); } @@ -214,7 +214,7 @@ namespace build2 windows_rpath_assembly (const file& t, const scope& bs, action act, - lorder lo, + linfo li, const string& tcpu, timestamp ts, bool scratch) const @@ -251,7 +251,7 @@ namespace build2 windows_dlls dlls; if (!empty) - dlls = windows_rpath_dlls (t, bs, act, lo); + dlls = windows_rpath_dlls (t, bs, act, li); // Clean the assembly directory and make sure it exists. Maybe it would // have been faster to overwrite the existing manifest rather than |