#ifdef JAVA
import JavaGen ( javaGen )
-import OccurAnal ( occurAnalyseBinds )
import qualified PrintJava
import OccurAnal ( occurAnalyseBinds )
#endif
+import Distribution.Package ( showPackageId )
import PprC ( writeCs )
import CmmLint ( cmmLint )
import Packages
-import DriverState ( getExplicitPackagesAnd, getPackageCIncludes )
+import Util ( filenameOf )
import FastString ( unpackFS )
import Cmm ( Cmm )
import HscTypes
-import CmdLineOpts
+import DynFlags
import ErrUtils ( dumpIfSet_dyn, showPass, ghcExit )
import Outputable
import Pretty ( Mode(..), printDoc )
import Module ( Module )
-import ListSetOps ( removeDupsEq )
+import List ( nub )
import Maybes ( firstJust )
import Directory ( doesFileExist )
-import Data.List ( intersperse )
import Monad ( when )
import IO
\end{code}
codeOutput :: DynFlags
-> Module
-> ForeignStubs
- -> Dependencies
+ -> [PackageId]
-> [Cmm] -- Compiled C--
-> IO (Bool{-stub_h_exists-}, Bool{-stub_c_exists-})
-codeOutput dflags this_mod foreign_stubs deps flat_abstractC
+codeOutput dflags this_mod foreign_stubs pkg_deps flat_abstractC
=
-- You can have C (c_output) or assembly-language (ncg_output),
-- but not both. [Allowing for both gives a space leak on
; let lints = map cmmLint flat_abstractC
; case firstJust lints of
Just err -> do { printDump err
- ; ghcExit 1
+ ; ghcExit dflags 1
}
Nothing -> return ()
}
; showPass dflags "CodeOutput"
- ; let filenm = dopt_OutName dflags
+ ; let filenm = hscOutName dflags
; stubs_exist <- outputForeignStubs dflags foreign_stubs
- ; case dopt_HscLang dflags of {
+ ; case hscTarget dflags of {
HscInterpreted -> return ();
HscAsm -> outputAsm dflags filenm flat_abstractC;
HscC -> outputC dflags filenm flat_abstractC stubs_exist
- deps foreign_stubs;
+ pkg_deps foreign_stubs;
HscJava ->
#ifdef JAVA
outputJava dflags filenm mod_name tycons core_binds;
\begin{code}
outputC dflags filenm flat_absC
- (stub_h_exists, _) dependencies foreign_stubs
+ (stub_h_exists, _) packages foreign_stubs
= do
-- figure out which header files to #include in the generated .hc file:
--
-- * -#include options from the cmdline and OPTIONS pragmas
-- * the _stub.h file, if there is one.
--
- let packages = dep_pkgs dependencies
- pkg_configs <- getExplicitPackagesAnd packages
- let pkg_names = map name pkg_configs
+ pkg_configs <- getExplicitPackagesAnd dflags packages
+ let pkg_names = map (showPackageId.package) pkg_configs
c_includes <- getPackageCIncludes pkg_configs
let cmdline_includes = cmdlineHcIncludes dflags -- -#include options
ffi_decl_headers
= case foreign_stubs of
NoStubs -> []
- ForeignStubs _ _ fdhs _ -> map unpackFS (fst (removeDupsEq fdhs))
+ ForeignStubs _ _ fdhs _ -> map unpackFS (nub fdhs)
-- Remove duplicates, because distinct foreign import decls
-- may cite the same #include. Order doesn't matter.
hPutStr h ("/* GHC_PACKAGES " ++ unwords pkg_names ++ "\n*/\n")
hPutStr h cc_injects
when stub_h_exists $
- hPutStrLn h ("#include \"" ++ (hscStubHOutName dflags) ++ "\"")
- writeCs h flat_absC
+ hPutStrLn h ("#include \"" ++ (filenameOf (hscStubHOutName dflags)) ++ "\"")
+ writeCs dflags h flat_absC
\end{code}
"Foreign export header file" stub_h_output_d
-- we need the #includes from the rts package for the stub files
- rts_pkgs <- getPackageDetails [rtsPackage]
- let rts_includes = concatMap mk_include (concatMap c_includes rts_pkgs)
+ let rtsid = rtsPackageId (pkgState dflags)
+ rts_includes
+ | ExtPackage pid <- rtsid =
+ let rts_pkg = getPackageDetails (pkgState dflags) pid in
+ concatMap mk_include (includes rts_pkg)
+ | otherwise = []
mk_include i = "#include \"" ++ i ++ "\"\n"
stub_h_file_exists