wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix /dev/null-for-.hi-file hack in pdynload. Fixes regress tests on linux

Browse Source
This commit is contained in:
dons 2005-05-16 03:31:19 +00:00
parent 5012249850
commit 638151b0e1
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/System/Plugins/Load.hs
View File

@ -69,6 +69,7 @@ import GHC.Prim ( unsafeCoerce# )
#if DEBUG #if DEBUG
import System.IO ( hFlush, stdout ) import System.IO ( hFlush, stdout )
#endif #endif
import System.IO ( hClose )
-- TODO need a loadPackage p package.conf :: IO () primitive -- TODO need a loadPackage p package.conf :: IO () primitive
@ -221,10 +222,6 @@ pdynload_ object incpaths pkgconfs args ty sym = do
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- run the typechecker over the constraint file -- run the typechecker over the constraint file
-- --
-- .hc into /dev/null, .hi into /dev/null
--
-- NON_PORTABLE == /dev/null
--
-- Problem: if the user depends on a non-auto package to build the -- Problem: if the user depends on a non-auto package to build the
-- module, then that package will not be in scope when we try to build -- module, then that package will not be in scope when we try to build
-- the module, when performing `unify'. Normally make() will handle this -- the module, when performing `unify'. Normally make() will handle this
@ -236,6 +233,8 @@ pdynload_ object incpaths pkgconfs args ty sym = do
-- --
unify obj incs args ty sym = do unify obj incs args ty sym = do
(tmpf,hdl) <- mkTemp (tmpf,hdl) <- mkTemp
(tmpf1,hdl1) <- mkTemp -- and send .hi file here.
hClose hdl1
let nm = mkModid (basename tmpf) let nm = mkModid (basename tmpf)
src = mkTest nm (mkModid obj) (fst $ break (=='.') ty) ty sym src = mkTest nm (mkModid obj) (fst $ break (=='.') ty) ty sym
@ -243,12 +242,12 @@ unify obj incs args ty sym = do
i = "-i" ++ dirname obj -- plugin i = "-i" ++ dirname obj -- plugin
hWrite hdl src hWrite hdl src
#if defined(CYGWIN) || defined(__MINGW32__) -- was need for cygwin, should be ok now:
e <- build tmpf "nul" (i:is++args++["-fno-code","-ohi nul"]) -- e <- build tmpf "nul" (i:is++args++["-fno-code","-ohi nul"])
#else
e <- build tmpf "/dev/null" (i:is++args++["-fno-code","-ohi/dev/null"]) e <- build tmpf tmpf1 (i:is++args++["-fno-code","-ohi "++tmpf1])
#endif
removeFile tmpf removeFile tmpf
removeFile tmpf1
return e return e
mkTest modnm plugin api ty sym = mkTest modnm plugin api ty sym =