Use extraGHCiLibraries (if supplied) in GHCi linker rather than extraLibraries

[ghc-hetmet.git] / ghc / compiler / main / ParsePkgConf.y

diff --git a/ghc/compiler/main/ParsePkgConf.y b/ghc/compiler/main/ParsePkgConf.y
index 1a4795e..901a5bc 100644 (file)
--- 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 = []}