From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 26 Dec 2022 12:55:38 +0000 (+0200)
Subject: Don't load a cross prefix for a native architecture
X-Git-Url: http://git.tdb.fi/?p=builder.git;a=commitdiff_plain;h=a1632bea664617a2762a68494430895dde2e8b2d

Don't load a cross prefix for a native architecture
---

diff --git a/source/architecture.cpp b/source/architecture.cpp
index dbe4001..54ffcf0 100644
--- 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 6a17c3e..2cf4fa2 100644
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -19,6 +19,9 @@ public:
 	{
 	public:
 		Loader(Architecture &);
+
+	private:
+		void cross_prefix(const std::string &);
 	};
 
 private: