summaryrefslogtreecommitdiff
path: root/Setup.hs
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2013-11-25 20:03:57 +0000
committerhallgren <hallgren@chalmers.se>2013-11-25 20:03:57 +0000
commitcb27ed0a67863a36d01c4686c6b04c80ae0c5255 (patch)
tree161106059ab668c20d95314e9af8334a69055f41 /Setup.hs
parent9541668f76a815ec30c27703d3226a6c2022b15e (diff)
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.
Diffstat (limited to 'Setup.hs')
-rw-r--r--Setup.hs6
1 files 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