From b3e5c678851ed73897b0eb337e656ff377d242c9 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 23 Jan 2020 14:46:21 -0500
Subject: [PATCH] hadrian: Throw error on duplicate-named flavours

Throw an error if the user requests a flavour for which there is more
than one match.

Fixes #17156.
---
 hadrian/src/Settings.hs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadrian/src/Settings.hs b/hadrian/src/Settings.hs
index 2263f68107..068e7ba914 100755
--- a/hadrian/src/Settings.hs
+++ b/hadrian/src/Settings.hs
@@ -58,12 +58,14 @@ flavour :: Action Flavour
 flavour = do
     flavourName <- fromMaybe userDefaultFlavour <$> cmdFlavour
     kvs <- userSetting ([] :: [KeyVal])
-    let unknownFlavour = error $ "Unknown build flavour: " ++ flavourName
-        flavours = hadrianFlavours ++ userFlavours
+    let flavours = hadrianFlavours ++ userFlavours
         (_settingErrs, tweak) = applySettings kvs
 
-    return $ maybe unknownFlavour tweak $
-        find ((== flavourName) . name) flavours
+    return $
+      case filter (\fl -> name fl == flavourName) flavours of
+        []  -> error $ "Unknown build flavour: " ++ flavourName
+        [f] -> tweak f
+        _   -> error $ "Multiple build flavours named " ++ flavourName
 
 getIntegerPackage :: Expr Package
 getIntegerPackage = expr (integerLibrary =<< flavour)
-- 
GitLab