From dd4a389117812f0d3b45473d87214d67d0cb4a3a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 12 Dec 2015 09:00:14 +0200 Subject: Add bin.libprefix to override default library prefix --- build/cxx/link.cxx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'build/cxx') diff --git a/build/cxx/link.cxx b/build/cxx/link.cxx index a00b92e..f5a2e3d 100644 --- a/build/cxx/link.cxx +++ b/build/cxx/link.cxx @@ -461,11 +461,24 @@ namespace build // if (t.path ().empty ()) { + auto l (t["extension"]); + const char* e (l ? as (*l).c_str () : nullptr); + switch (lt) { - case type::e: t.derive_path ("" ); break; - case type::a: t.derive_path ("a", "lib"); break; - case type::so: t.derive_path ("so", "lib"); break; + case type::e: + { + t.derive_path (e != nullptr ? e : ""); + break; + } + case type::a: + case type::so: + { + auto l (t["bin.libprefix"]); + t.derive_path (e != nullptr ? e : (lt == type::a ? "a" : "so"), + l ? as (*l).c_str () : "lib"); + break; + } } } -- cgit v1.1