Don't load a cross prefix for a native architecture

diff --git a/source/architecture.cpp b/source/architecture.cpp
index dbe40010c896680dfebbc6c0382f34fff06ad106..54ffcf0f872cf7d5e1483190e9156cded9012402 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -327,5 +327,11 @@ void Architecture::parse_specification(const string &spec)
 Architecture::Loader::Loader(Architecture &a):
        DataFile::ObjectLoader<Architecture>(a)
 {
-       add("prefix", &Architecture::cross_prefix);
+       add("prefix", &Loader::cross_prefix);
+}
+
+void Architecture::Loader::cross_prefix(const string &p)
+{
+       if(!obj.native)
+               obj.cross_prefix = p;
 }

diff --git a/source/architecture.h b/source/architecture.h
index 6a17c3e44852aeecfc0e7b6ae9a2fd24e748dabc..2cf4fa2fdff88bd9014e7cd800aa4754b1d9f3a0 100644 (file)
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -19,6 +19,9 @@ public:
        {
        public:
                Loader(Architecture &);
+
+       private:
+               void cross_prefix(const std::string &);
        };
 
 private: