X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FParsePkgConf.y;h=901a5bc94335b871c41fcc8be349ba4cfd54b02f;hb=8002c9d5ceafef6b8fa6765701c5c3103c69760c;hp=1a4795e8a7a7e7f30b7b5850a70085b25ee761c4;hpb=72a42bd77936ad0edd7426a33b323e60323e9684;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/ParsePkgConf.y b/ghc/compiler/main/ParsePkgConf.y
index 1a4795e..901a5bc 100644
--- a/ghc/compiler/main/ParsePkgConf.y
+++ b/ghc/compiler/main/ParsePkgConf.y
@@ -3,9 +3,9 @@ module ParsePkgConf( loadPackageConfig ) where
 
 #include "HsVersions.h"
 
-import Packages
+import PackageConfig
 import Lexer
-import CmdLineOpts
+import DynFlags
 import FastString
 import StringBuffer
 import ErrUtils  ( mkLocMessage )
@@ -82,13 +82,14 @@ field	:: { PackageConfig -> PackageConfig }
 		        "libraryDirs"       -> p{libraryDirs       = $3}
 		        "hsLibraries"       -> p{hsLibraries       = $3}
 		        "extraLibraries"    -> p{extraLibraries    = $3}
+		        "extraGHCiLibraries"-> p{extraGHCiLibraries= $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 = []}