From 44ee866e5bc20fcdf29ab13ea050816da9faf915 Mon Sep 17 00:00:00 2001 From: Roman Leshchinskiy Date: Tue, 16 Sep 2008 03:34:28 +0000 Subject: [PATCH] Remove last traces of package ndp --- compiler/basicTypes/Module.lhs | 4 +--- compiler/main/Packages.lhs | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/compiler/basicTypes/Module.lhs b/compiler/basicTypes/Module.lhs index b4f9cd1..01fcb7e 100644 --- a/compiler/basicTypes/Module.lhs +++ b/compiler/basicTypes/Module.lhs @@ -38,7 +38,6 @@ module Module haskell98PackageId, sybPackageId, thPackageId, - ndpPackageId, dphSeqPackageId, dphParPackageId, mainPackageId, @@ -318,7 +317,7 @@ packageIdString = unpackFS . packageIdFS integerPackageId, primPackageId, basePackageId, rtsPackageId, haskell98PackageId, sybPackageId, - thPackageId, ndpPackageId, dphSeqPackageId, dphParPackageId, + thPackageId, dphSeqPackageId, dphParPackageId, mainPackageId :: PackageId primPackageId = fsToPackageId (fsLit "ghc-prim") integerPackageId = fsToPackageId (fsLit "integer") @@ -327,7 +326,6 @@ rtsPackageId = fsToPackageId (fsLit "rts") haskell98PackageId = fsToPackageId (fsLit "haskell98") sybPackageId = fsToPackageId (fsLit "syb") thPackageId = fsToPackageId (fsLit "template-haskell") -ndpPackageId = fsToPackageId (fsLit "ndp") dphSeqPackageId = fsToPackageId (fsLit "dph-seq") dphParPackageId = fsToPackageId (fsLit "dph-par") diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index e2a0a04..ce3c064 100644 --- a/compiler/main/Packages.lhs +++ b/compiler/main/Packages.lhs @@ -393,8 +393,7 @@ findWiredInPackages dflags pkgs preload this_package = do (sybPackageId, [""]), (thPackageId, [""]), (dphSeqPackageId, [""]), - (dphParPackageId, [""]), - (ndpPackageId, ["-seq", "-par"]) ] + (dphParPackageId, [""])] matches :: PackageConfig -> (PackageId, [String]) -> Bool pc `matches` (pid, suffixes) -- 1.7.10.4