From: simonmar <unknown>
Date: Fri, 18 Feb 2005 16:19:10 +0000 (+0000)
Subject: [project @ 2005-02-18 16:19:10 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1052
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=11eb56fbb0d6dca5e43ccb958042b51c4c20c381

[project @ 2005-02-18 16:19:10 by simonmar]
Track InstalledPackageInfo updates
---

diff --git a/ghc/compiler/main/Packages.lhs b/ghc/compiler/main/Packages.lhs
index 8a4009d..951601d 100644
--- a/ghc/compiler/main/Packages.lhs
+++ b/ghc/compiler/main/Packages.lhs
@@ -439,7 +439,7 @@ getPackageLinkOpts dflags pkgs = do
   let 
 	imp        = if static then "" else "_dyn"
       	libs p     = map ((++imp) . addSuffix) (hACK (hsLibraries p)) ++ extraLibraries p
-	all_opts p = map ("-l" ++) (libs p) ++ extraLdOpts p
+	all_opts p = map ("-l" ++) (libs p) ++ ldOptions p
 
 	suffix     = if null tag then "" else  '_':tag
 	rts_suffix = if null rts_tag then "" else  '_':rts_tag
@@ -483,7 +483,7 @@ getPackageLinkOpts dflags pkgs = do
 getPackageExtraCcOpts :: DynFlags -> [PackageId] -> IO [String]
 getPackageExtraCcOpts dflags pkgs = do
   ps <- getExplicitPackagesAnd dflags pkgs
-  return (concatMap extraCcOpts ps)
+  return (concatMap ccOptions ps)
 
 getPackageFrameworkPath  :: DynFlags -> [PackageId] -> IO [String]
 getPackageFrameworkPath dflags pkgs = do
@@ -493,7 +493,7 @@ getPackageFrameworkPath dflags pkgs = do
 getPackageFrameworks  :: DynFlags -> [PackageId] -> IO [String]
 getPackageFrameworks dflags pkgs = do
   ps <- getExplicitPackagesAnd dflags pkgs
-  return (concatMap extraFrameworks ps)
+  return (concatMap frameworks ps)
 
 -- -----------------------------------------------------------------------------
 -- Package Utils
diff --git a/ghc/compiler/main/ParsePkgConf.y b/ghc/compiler/main/ParsePkgConf.y
index a3c78cf..3aae806 100644
--- a/ghc/compiler/main/ParsePkgConf.y
+++ b/ghc/compiler/main/ParsePkgConf.y
@@ -84,11 +84,11 @@ field	:: { PackageConfig -> PackageConfig }
 		        "extraLibraries"    -> p{extraLibraries    = $3}
 		        "includeDirs"       -> p{includeDirs       = $3}
 		        "includes"          -> p{includes          = $3}
-		        "extraHugsOpts"     -> p{extraHugsOpts     = $3}
-		        "extraCcOpts"       -> p{extraCcOpts       = $3}
-		        "extraLdOpts"       -> p{extraLdOpts       = $3}
+		        "hugsOptions"       -> p{hugsOptions       = $3}
+		        "ccOptions"         -> p{ccOptions         = $3}
+		        "ldOptions"         -> p{ldOptions         = $3}
 		        "frameworkDirs"     -> p{frameworkDirs     = $3}
-		        "extraFrameworks"   -> p{extraFrameworks   = $3}
+		        "frameworks"        -> p{frameworks        = $3}
 		        "haddockInterfaces" -> p{haddockInterfaces = $3}
 		        "haddockHTMLs"      -> p{haddockHTMLs      = $3}
 		        "depends"     	    -> p{depends = []}