From a463914eb9cbda38ec52e576f391dfc169c596d6 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Tue, 19 Nov 2024 15:32:57 +0100 Subject: [PATCH] Fix rc scanner not handling absolute paths correctly (#425) This applies the same change as 290e284 did for `cpp.jam`. Fixes #420 --- src/tools/rc.jam | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/tools/rc.jam b/src/tools/rc.jam index ce94b9b828..ef4ef6e859 100644 --- a/src/tools/rc.jam +++ b/src/tools/rc.jam @@ -93,12 +93,17 @@ class res-scanner : scanner import path ; import regex ; import scanner ; + import toolset ; import virtual-target ; rule __init__ ( includes * ) { scanner.__init__ ; - self.includes = $(includes) ; + + # toolset.handle-flag-value is a bit of overkill, but it + # does correctly handle the topological sort of && separated + # include paths + self.includes = [ toolset.handle-flag-value : $(includes) ] ; } rule pattern ( )