Change arch and prefix to global options

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index b3685d565db45d828a49ea99cab5a9bdc7cbf0ef..753a4ef65b0577dca6bf0301290898461cd188de 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -157,8 +157,10 @@ void Config::finish()
                                string value;
                                if(is_option(var))
                                        value=get_option(var).value;
-                               else
-                                       value=getenv(var.c_str());
+                               else if(var=="arch")
+                                       value=package.get_builder().get_current_arch().get_name();
+                               else if(const char *ptr=getenv(var.c_str()))
+                                       value=ptr;
 
                                opt.value.replace(dollar, end-dollar, value);
 
@@ -211,7 +213,8 @@ void Config::load()
 
        try
        {
-               IO::File in(fn.str());
+               IO::File inf(fn.str());
+               IO::Buffered in(inf);
 
                mtime=Time::TimeStamp::from_unixtime(stat(fn).st_mtime);