From 9a45a0b7ab27987d261438b2bee9b977b3e73f01 Mon Sep 17 00:00:00 2001
From: tijl <tijl@FreeBSD.org>
Date: Mon, 10 Jun 2013 08:39:14 +0000
Subject: Append per arch defaults directly to OPTIONS_DEFAULT. Duplicates are
 eliminated later.

---
 Mk/bsd.options.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Mk/bsd.options.mk')

diff --git a/Mk/bsd.options.mk b/Mk/bsd.options.mk
index 3db6831bd318..cf261f4043d8 100644
--- a/Mk/bsd.options.mk
+++ b/Mk/bsd.options.mk
@@ -76,11 +76,7 @@ OPTIONS_DEFINE+=	${opt}
 .endfor
 
 # Add per arch defaults
-.for opt in ${OPTIONS_DEFAULT_${ARCH}}
-.if empty(OPTIONS_DEFAULT:M${opt})
-OPTIONS_DEFAULT+=	${opt}
-.endif
-.endfor
+OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${ARCH}}
 
 # Remove options the port maintainer doesn't want
 .for opt in ${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} ${OPTIONS_SLAVE}
-- 
cgit