From ff688a8694b686943c9789d90554d442929fddc4 Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Wed, 7 Jan 2015 12:12:36 +0000 Subject: [PATCH] Move MALTA_COMMON to std.MALTA (as we have for XLP and SWARM). This avoids universe trying to build MALTA_COMMON and fail due to the problem addressed in r276773. Include std.MALTA from the MALTA mipsel and MALTA64 mips64el config files, where the machine lines exist. --- sys/mips/conf/MALTA | 2 +- sys/mips/conf/MALTA64 | 2 +- sys/mips/conf/{MALTA_COMMON => std.MALTA} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename sys/mips/conf/{MALTA_COMMON => std.MALTA} (100%) diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA index 6e9e49c6a0cd..1ecd171e63b2 100644 --- a/sys/mips/conf/MALTA +++ b/sys/mips/conf/MALTA @@ -4,7 +4,7 @@ ident MALTA -include "MALTA_COMMON" +include "std.MALTA" machine mips mipsel # Malta supports both, so it isn't in std.malta diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64 index c537fa680fd1..904547d459b9 100644 --- a/sys/mips/conf/MALTA64 +++ b/sys/mips/conf/MALTA64 @@ -4,7 +4,7 @@ ident MALTA64 -include "MALTA_COMMON" +include "std.MALTA" machine mips mips64el # Malta supports both, so it isn't in std.malta diff --git a/sys/mips/conf/MALTA_COMMON b/sys/mips/conf/std.MALTA similarity index 100% rename from sys/mips/conf/MALTA_COMMON rename to sys/mips/conf/std.MALTA