[project @ 2005-03-02 11:06:58 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / Packages.lhs

diff --git a/ghc/compiler/main/Packages.lhs b/ghc/compiler/main/Packages.lhs
index 4b758b2..bc83440 100644 (file)
--- a/ghc/compiler/main/Packages.lhs
+++ b/ghc/compiler/main/Packages.lhs
@@ -34,9 +34,6 @@ module Packages (
     )
 where
 
-#include "../includes/ghcconfig.h"
--- Needed for mingw32_TARGET_OS defn
-
 #include "HsVersions.h"
 
 import PackageConfig   
@@ -44,7 +41,7 @@ import DriverState    ( v_Build_tag, v_RTS_Build_tag, v_Static )
 import SysTools                ( getTopDir, getPackageConfigPath )
 import ParsePkgConf    ( loadPackageConfig )
 import CmdLineOpts     ( DynFlags(..), PackageFlag(..), opt_Static )
-import Config          ( cTARGETARCH, cTARGETOS, cProjectVersion )
+import Config          ( cProjectVersion )
 import Name            ( Name, nameModule_maybe )
 import Module          ( Module, mkModule )
 import UniqFM
@@ -206,7 +203,7 @@ readPackageConfigs dflags = do
        -- (GHC >= 6.3).
    appdir <- getAppUserDataDirectory "ghc"
    let 
-        pkgconf = appdir ++ '/':cTARGETARCH ++ '-':cTARGETOS
+        pkgconf = appdir ++ '/':TARGET_ARCH ++ '-':TARGET_OS
                        ++ '-':cProjectVersion ++ "/package.conf"
    --
    exists <- doesFileExist pkgconf
@@ -225,7 +222,7 @@ readPackageConfig
    :: DynFlags -> PackageConfigMap -> FilePath -> IO PackageConfigMap
 readPackageConfig dflags pkg_map conf_file = do
   when (verbosity dflags >= 2) $
-       hPutStrLn stderr ("Reading package config file: "
+       hPutStrLn stderr ("Using package config file: "
                         ++ conf_file)
   proto_pkg_configs <- loadPackageConfig conf_file
   top_dir          <- getTopDir
@@ -442,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
@@ -486,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
@@ -496,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