diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-04-26 09:58:35 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-04-26 09:58:35 +0200 |
commit | 10cdf9fdcd4181f2ea3dec1abf5bcc359b87829c (patch) | |
tree | f8fb9dc8d185f8a985421c1352c10d69e96f9a7d /build/cxx | |
parent | 54e24990203f5e123396a44297ea4656ed3b6101 (diff) |
Cleanup cxx.link rule
Diffstat (limited to 'build/cxx')
-rw-r--r-- | build/cxx/rule.cxx | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/build/cxx/rule.cxx b/build/cxx/rule.cxx index 7f9ea02..2d64701 100644 --- a/build/cxx/rule.cxx +++ b/build/cxx/rule.cxx @@ -775,16 +775,6 @@ namespace build bool so (tt == type::libso); - // Decide which lib{} member to use for this target. - // - bool lso; // Lib-so. - switch (tt) - { - case type::exe: lso = true; break; - case type::liba: lso = false; break; - case type::libso: lso = true; break; - } - if (!execute_prerequisites (a, t, t.mtime ())) return target_state::unchanged; @@ -827,14 +817,10 @@ namespace build { path_target* ppt; - if (obj* o = pt->is_a<obj> ()) - ppt = so ? static_cast<path_target*> (o->so) : o->a; - else if ((ppt = pt->is_a<obja> ())) + if ((ppt = pt->is_a<obja> ())) ; else if ((ppt = pt->is_a<objso> ())) ; - else if (lib* l = pt->is_a<lib> ()) - ppt = lso ? static_cast<path_target*> (l->so) : l->a; else if ((ppt = pt->is_a<liba> ())) ; else if ((ppt = pt->is_a<libso> ())) |