]> git.tdb.fi Git - builder.git/blobdiff - source/sourcefile.cpp
Change arch and prefix to global options
[builder.git] / source / sourcefile.cpp
index 718a09c48541152d3c15f484b5048ce81017f94e..af1c04a5cf4205be339b86a1e9cead91f8a02f90 100644 (file)
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <fstream>
+#include <iostream>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -35,6 +36,9 @@ void SourceFile::find_depends()
                ifstream in(name.c_str());
                if(!in) return;
 
+               if(builder.get_verbose()>=4)
+                       cout<<"Reading includes from "<<name<<'\n';
+
                Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
                string line;
@@ -48,12 +52,11 @@ void SourceFile::find_depends()
                includes=deps_cache.get_deps(name);
 
        const StringList &incpath=comp->get_build_info().incpath;
-       const string &arch=comp->get_package().get_arch();
 
        string path=name.substr(0, name.rfind('/'));
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr=builder.get_header(*i, arch, path, incpath);
+               Target *hdr=builder.get_header(*i, path, incpath);
                if(hdr)
                        add_depend(hdr);
        }