From 78ac6aee6dff1b608bc312fe7ada442ba83710e8 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 18 Jun 2020 14:51:38 +0200
Subject: Complete NetBSD compatibility

---
 libbuild2/cc/guess.cxx     | 5 ++++-
 libbuild2/cc/guess.hxx     | 1 +
 libbuild2/cc/pkgconfig.cxx | 3 ++-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/guess.cxx b/libbuild2/cc/guess.cxx
index 109dfa3..a2a6397 100644
--- a/libbuild2/cc/guess.cxx
+++ b/libbuild2/cc/guess.cxx
@@ -261,6 +261,8 @@ namespace build2
 "     stdlib:=\"glibc\"        /* pretend to be it.                      */ \n"
 "#  elif defined(__FreeBSD__)                                               \n"
 "     stdlib:=\"freebsd\"                                                   \n"
+"#  elif defined(__NetBSD__)                                                \n"
+"     stdlib:=\"netbsd\"                                                    \n"
 "#  elif defined(__APPLE__)                                                 \n"
 "     stdlib:=\"apple\"                                                     \n"
 "#  else                                                                    \n"
@@ -2429,7 +2431,8 @@ namespace build2
         }
         else if (tt.system == "win32-msvc")  rt = "msvc";
         else if (tt.system == "linux-gnu" ||
-                 tt.system == "freebsd")     rt = "libgcc";
+                 tt.system == "freebsd"   ||
+                 tt.system == "netbsd")      rt = "libgcc";
         else /* Mac OS, etc. */              rt = "compiler-rt";
       }
 
diff --git a/libbuild2/cc/guess.hxx b/libbuild2/cc/guess.hxx
index b9c1386..3c58bec 100644
--- a/libbuild2/cc/guess.hxx
+++ b/libbuild2/cc/guess.hxx
@@ -203,6 +203,7 @@ namespace build2
       // glibc
       // msvc         (msvcrt.lib/msvcrNNN.dll)
       // freebsd
+      // netbsd
       // apple
       // newlib       (also used by Cygwin)
       // klibc
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index bcab64e..7fd07dc 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -531,7 +531,8 @@ namespace build2
       }
       else if (tsys == "freebsd")
       {
-        // On FreeBSD .pc files go to libdata/pkgconfig/, not lib/pkgconfig/.
+        // On FreeBSD (but not NetBSD) .pc files go to libdata/pkgconfig/, not
+        // lib/pkgconfig/.
         //
         (((pd = d) /= "..") /= "libdata") /= "pkgconfig";
 
-- 
cgit v1.1