From 658e0b3dbf496f6489ee6a5054f5609a7fa9ce5a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Jun 2022 06:11:04 +0200
Subject: Add ability to control -I translation in $x.lib_poptions()

---
 libbuild2/cc/compile-rule.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libbuild2/cc/compile-rule.cxx')

diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index 7059f15..1b8a5a8 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -690,12 +690,12 @@ namespace build2
                             const scope& bs,
                             action a, const file& l, bool la,
                             linfo li,
-                            bool common) const
+                            bool common,
+                            bool original) const
     {
-      // @@ Is this a good idea? We don't know which tool will be using
-      //    these...
-      //
-      const scope* is (isystem (*this) ? effective_iscope (bs) : nullptr);
+      const scope* is (!original && isystem (*this)
+                       ? effective_iscope (bs)
+                       : nullptr);
       append_library_options (ls, args, bs, is, a, l, la, li, common, nullptr);
     }
 
-- 
cgit v1.1