diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-07-03 13:59:59 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-07-03 13:59:59 +0100 |
| commit | 606ec0a1749399d9085444362b7203b4e96e0530 (patch) | |
| tree | 34573439f9749e45572799786c558f63dec78368 | |
| parent | c548fec4f11920244e81b9f83ebb2aaf7d08ba40 (diff) | |
| parent | fdc3761834185c38dcec1faedabe08065bd66bed (diff) | |
| download | haskell-606ec0a1749399d9085444362b7203b4e96e0530.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
| -rw-r--r-- | compiler/hsSyn/Convert.lhs | 3 | ||||
| -rw-r--r-- | mk/build.mk.sample | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs index a07fafe00d..f7d5bdb084 100644 --- a/compiler/hsSyn/Convert.lhs +++ b/compiler/hsSyn/Convert.lhs @@ -251,10 +251,13 @@ cvtDec (TySynInstD tc eqn) , tfid_fvs = placeHolderNames } } } cvtDec (ClosedTypeFamilyD tc tyvars mkind eqns) + | not $ null eqns = do { (_, tc', tvs') <- cvt_tycl_hdr [] tc tyvars ; mkind' <- cvtMaybeKind mkind ; eqns' <- mapM (cvtTySynEqn tc') eqns ; returnL $ TyClD (FamDecl (FamilyDecl (ClosedTypeFamily eqns') tc' tvs' mkind')) } + | otherwise + = failWith (ptext (sLit "Illegal empty closed type family")) ---------------- cvtTySynEqn :: Located RdrName -> TySynEqn -> CvtM (LTyFamInstEqn RdrName) cvtTySynEqn tc (TySynEqn lhs rhs) diff --git a/mk/build.mk.sample b/mk/build.mk.sample index 7036fad5f1..1b05ddee6a 100644 --- a/mk/build.mk.sample +++ b/mk/build.mk.sample @@ -81,10 +81,6 @@ GhcHcOpts = -Rghc-timing GhcLibHcOpts = -O2 GhcLibWays += p -ifeq "$(PlatformSupportsSharedLibs)" "YES" -GhcLibWays += dyn -endif - DYNAMIC_BY_DEFAULT = NO DYNAMIC_GHC_PROGRAMS = NO |