Pass a tool hint to VirtualFileSystem::find_header

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index d4f6d79df9e0a0e2116d4d3ed6548d00c58b6337..0034ebd0e564870c6ed101835f52cd130ef42506 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -6,6 +6,7 @@
 #include "component.h"
 #include "csourcefile.h"
 #include "sourcepackage.h"
+#include "tool.h"
 
 using namespace std;
 using namespace Msp;
@@ -58,9 +59,12 @@ void CSourceFile::find_dependencies()
        local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
        local_incpath.push_front(FS::dirname(path).str());
 
+       Tool *compiler = builder.get_toolchain().get_tool_for_suffix(FS::extpart(FS::basename(path)), true);
+       if(compiler)
+               compiler->prepare();
        for(IncludeList::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
+               Target *hdr = builder.get_vfs().find_header(i->substr(1), compiler, ((*i)[0]=='"' ? local_incpath : incpath));
                if(hdr)
                        add_transitive_dependency(*hdr);
        }