aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-10-08 11:05:31 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-10-08 11:05:31 +0200
commit6084692e2bd4e0053cac7dc3f569738651ee9042 (patch)
treef28061b4a7da63db67a250681b5248e6681bdaec
parent1ec2e86ecf694f28ceedbfad5eca8d821a844418 (diff)
Extend /LIBPATH handling to win32-msvc target system
-rw-r--r--libbuild2/cc/common.cxx4
-rw-r--r--libbuild2/cc/pkgconfig.cxx2
2 files changed, 4 insertions, 2 deletions
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index 7d929a8..f14f973 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -970,6 +970,8 @@ namespace build2
//
auto extract = [&bs, &r, this] (const value& val, const variable& var)
{
+ bool msvc (tsys == "win32-msvc");
+
const auto& v (cast<strings> (val));
for (auto i (v.begin ()), e (v.end ()); i != e; ++i)
@@ -980,7 +982,7 @@ namespace build2
try
{
- if (cclass == compiler_class::msvc)
+ if (msvc)
{
// /LIBPATH:<dir> (case-insensitive).
//
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index 0669b02..31b0770 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -945,7 +945,7 @@ namespace build2
if (!lops.empty ())
{
- if (cclass == compiler_class::msvc)
+ if (tsys == "win32-msvc")
{
// Translate -L to /LIBPATH.
//