From 9a74261b18ffc9ecaf6416110df56a51f6d1d3e7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 11 Dec 2017 17:09:49 +0200
Subject: Fix Clang on Windows C runtime library linking logic

---
 build2/cc/link.cxx | 4 ++--
 build2/utility.hxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index c51ccd2..623100b 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -1700,8 +1700,8 @@ namespace build2
             // multi-threaded runtime) unless -nostdlib or -nostartfiles is
             // specified.
             //
-            if (!find_option ("-nostdlib", args) &&
-                !find_option ("-nostartfiles", args))
+            if (!find_options ({"-nostdlib", "-nostartfiles"}, t, c_coptions) &&
+                !find_options ({"-nostdlib", "-nostartfiles"}, t, x_coptions))
               args.push_back ("/DEFAULTLIB:libcmt.lib");
           }
 
diff --git a/build2/utility.hxx b/build2/utility.hxx
index 8ba4fe1..77c46a8 100644
--- a/build2/utility.hxx
+++ b/build2/utility.hxx
@@ -401,7 +401,7 @@ namespace build2
   bool
   find_option (const char* option, const cstrings&, bool ignore_case = false);
 
-  // As above but look for several options.
+  // As above but look for several options returning true if any is present.
   //
   template <typename T>
   bool
-- 
cgit v1.1