diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-14 20:05:42 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-15 00:49:49 +0000 |
| commit | f5e2ccab3677b80439c5220bcfbd9153ae367795 (patch) | |
| tree | d3df670c2bd64efcc8280791bd8bdcc244ed0fb1 /compiler | |
| parent | b7126674a5f4ead9c73a6a2cbe0fbc85f7d36c12 (diff) | |
| download | haskell-f5e2ccab3677b80439c5220bcfbd9153ae367795.tar.gz | |
Set the way to 'dynamic' when running GHCi if GHCi is dynamically linked
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/main/DynFlags.hs | 8 | ||||
| -rw-r--r-- | compiler/utils/Fingerprint.hsc | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 876d2ea759..74546e3259 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -50,7 +50,8 @@ module DynFlags ( printOutputForUser, printInfoForUser, - Way(..), mkBuildTag, wayRTSOnly, + Way(..), mkBuildTag, wayRTSOnly, updateWays, + wayGeneralFlags, -- ** Safe Haskell SafeHaskellMode(..), @@ -1847,11 +1848,10 @@ parseDynamicFlagsFull activeFlags cmdline dflags0 args = do updateWays :: DynFlags -> DynFlags updateWays dflags = let theWays = sort $ nub $ ways dflags - theBuildTag = mkBuildTag (filter (not . wayRTSOnly) theWays) in dflags { ways = theWays, - buildTag = theBuildTag, - rtsBuildTag = mkBuildTag theWays + buildTag = mkBuildTag (filter (not . wayRTSOnly) theWays), + rtsBuildTag = mkBuildTag theWays } -- | Check (and potentially disable) any extensions that aren't allowed diff --git a/compiler/utils/Fingerprint.hsc b/compiler/utils/Fingerprint.hsc index e006598e45..95f31c08bb 100644 --- a/compiler/utils/Fingerprint.hsc +++ b/compiler/utils/Fingerprint.hsc @@ -8,6 +8,7 @@ -- -- ---------------------------------------------------------------------------- +{-# OPTIONS_GHC -fno-warn-orphans #-} module Fingerprint ( Fingerprint(..), fingerprint0, readHexFingerprint, |