Change arch and prefix to global options

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index c0a233f56d8f51fe3d916ec4c70776330314d7ed..3fd88d25b06f83af74eb8a051e55d4af05a2cf06 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -71,13 +71,12 @@ void ObjectFile::find_depends(Target *tgt)
        if(!src)
                return;
 
-       const string &arch=comp.get_package().get_arch();
        const StringList &incpath=comp.get_build_info().incpath;
 
        const list<string> &includes=src->get_includes();
        for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr2=builder.get_header(*i, arch, path, incpath);
+               Target *hdr2=builder.get_header(*i, path, incpath);
                if(hdr2 && find(depends.begin(), depends.end(), hdr2)==depends.end())
                        add_depend(hdr2);
        }
@@ -94,5 +93,6 @@ void ObjectFile::add_depend(Target *tgt)
 
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
-       return (comp.get_package().get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
+       const SourcePackage &pkg=comp.get_package();
+       return (pkg.get_temp_dir()/comp.get_name()/(splitext(basename(src)).base+".o")).str();
 }