remove bogus calls to decode in loadDepends
decode was being called on the module names in loadDepends, however these strings were not Z-coded. Most of the time decode just returns the string unmodified, which is why this problem has not caused widespread failure.
This commit is contained in:
parent
d548687001
commit
927cb18681
@ -661,7 +661,7 @@ loadDepends obj incpaths = do
|
|||||||
-- now, try to generate a path to the actual .o file
|
-- now, try to generate a path to the actual .o file
|
||||||
-- fix up hierachical names
|
-- fix up hierachical names
|
||||||
let mods_ = map (\s -> (s, map (\c ->
|
let mods_ = map (\s -> (s, map (\c ->
|
||||||
if c == '.' then '/' else c) $ decode s)) ds'
|
if c == '.' then '/' else c) $ s)) ds'
|
||||||
|
|
||||||
-- construct a list of possible dependent modules to load
|
-- construct a list of possible dependent modules to load
|
||||||
let mods = concatMap (\p ->
|
let mods = concatMap (\p ->
|
||||||
@ -691,7 +691,7 @@ loadDepends obj incpaths = do
|
|||||||
#if DEBUG
|
#if DEBUG
|
||||||
when (not (null ps')) $ putStrLn "done"
|
when (not (null ps')) $ putStrLn "done"
|
||||||
putStr "Loading object"
|
putStr "Loading object"
|
||||||
mapM_ (\(m,_) -> putStr (" "++(decode m)) >> hFlush stdout) mods''
|
mapM_ (\(m,_) -> putStr (" "++ m) >> hFlush stdout) mods''
|
||||||
#endif
|
#endif
|
||||||
moduleDeps <- mapM (\(hi,m) -> loadObject m (Object hi)) mods''
|
moduleDeps <- mapM (\(hi,m) -> loadObject m (Object hi)) mods''
|
||||||
return (hiface,moduleDeps)
|
return (hiface,moduleDeps)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user