From cb27ed0a67863a36d01c4686c6b04c80ae0c5255 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Mon, 25 Nov 2013 20:03:57 +0000
Subject: [PATCH] Setup.hs: avoid a problem with Cabal-1.18

In Cabal-1.18, the build command takes some new arguments. The Setup.hs script
should not die if these are present.
---
 Setup.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index 83a4dc72e..87aab235b 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -120,9 +120,9 @@ checkRGLArgs args = do
   let args' = filter (\arg -> not (arg `elem` all_modes ||
                                    rgl_prefix `isPrefixOf` arg ||
                                    langs_prefix `isPrefixOf` arg)) args
-  if null args'
-    then return emptyHookedBuildInfo
-    else die $ "Unrecognised flags: " ++ intercalate ", " args'
+  unless (null args') $
+    putStrLn $ "Unrecognised flags: " ++ intercalate ", " args'
+  return emptyHookedBuildInfo
 
 buildRGL args flags pkg lbi = do
   let cmds = getRGLCommands args