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
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
getPackageFrameworks :: DynFlags -> [PackageId] -> IO [String]
getPackageFrameworks dflags pkgs = do
ps <- getExplicitPackagesAnd dflags pkgs
- return (concatMap extraFrameworks ps)
+ return (concatMap frameworks ps)
-- -----------------------------------------------------------------------------
-- Package Utils
"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 = []}