Merge pull request #1939 from JPMoresmau/master

-dynamic is not a debug flag

Merge pull request #1939 from JPMoresmau/master
-dynamic is not a debug flag
8be51771 · Duncan Coutts · 58a13167 · 92192161 · 8be51771
Commit 8be51771 authored Jun 21, 2014 by Duncan Coutts
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Cabal/Distribution/PackageDescription/Check.hs Cabal/Distribution/PackageDescription/Check.hs +3 -2

No files found.
--- a/Cabal/Distribution/PackageDescription/Check.hs
+++ b/Cabal/Distribution/PackageDescription/Check.hs
@@ -594,8 +594,9 @@ checkGhcOptions pkg =
  , checkFlags ["-fhpc"] $
      PackageDistInexcusable $
        "'ghc-options: -fhpc' is not appropriate for a distributed package."
-
-  , check (any ("-d" `isPrefixOf`) all_ghc_options) $
+    
+    -- -dynamic is not a debug flag
+  , check (any (\opt -> "-d" `isPrefixOf` opt && opt /= "-dynamic") all_ghc_options) $
      PackageDistInexcusable $
        "'ghc-options: -d*' debug flags are not appropriate for a distributed package."