]> git.tdb.fi Git - builder.git/commitdiff
create the tools when everything else is ready
authorMikko Rasa <tdb@tdb.fi>
Mon, 9 Jul 2012 10:57:15 +0000 (13:57 +0300)
committerMikko Rasa <tdb@tdb.fi>
Mon, 9 Jul 2012 10:57:15 +0000 (13:57 +0300)
source/builder.cpp

index 4ca2e43ec87bdcef8942f49e4fd85aebafd25dcf..96df23b7df5c0394800fa21caf59160fff8cdac0 100644 (file)
@@ -183,14 +183,6 @@ Builder::Builder(int argc, char **argv):
                        }
        }
 
-       toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
-       toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
-       toolchain.add_tool(new GnuLinker(*this, *current_arch));
-       toolchain.add_tool(new GnuArchiver(*this, *current_arch));
-       toolchain.add_tool(new Copy(*this));
-       toolchain.add_tool(new Tar(*this));
-       toolchain.add_tool(new PkgConfigGenerator(*this));
-
        if(prfx.empty())
        {
                if(current_arch->is_native())
@@ -211,6 +203,14 @@ Builder::Builder(int argc, char **argv):
                vector<string> warns = split(*i, ',');
                warnings.insert(warnings.end(), warns.begin(), warns.end());
        }
+
+       toolchain.add_tool(new GnuCCompiler(*this, *current_arch));
+       toolchain.add_tool(new GnuCxxCompiler(*this, *current_arch));
+       toolchain.add_tool(new GnuLinker(*this, *current_arch));
+       toolchain.add_tool(new GnuArchiver(*this, *current_arch));
+       toolchain.add_tool(new Copy(*this));
+       toolchain.add_tool(new Tar(*this));
+       toolchain.add_tool(new PkgConfigGenerator(*this));
 }
 
 Builder::~Builder()