projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
929d166
)
Rename a variable
author
Ian Lynagh
<igloo@earth.li>
Sat, 13 Mar 2010 22:48:52 +0000
(22:48 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 13 Mar 2010 22:48:52 +0000
(22:48 +0000)
compiler/main/DriverPipeline.hs
patch
|
blob
|
history
diff --git
a/compiler/main/DriverPipeline.hs
b/compiler/main/DriverPipeline.hs
index
4e48a58
..
2bdf982
100644
(file)
--- a/
compiler/main/DriverPipeline.hs
+++ b/
compiler/main/DriverPipeline.hs
@@
-1423,7
+1423,7
@@
linkBinary dflags o_files dep_packages = do
let no_hs_main = dopt Opt_NoHsMain dflags
let main_lib | no_hs_main = []
| otherwise = [ "-lHSrtsmain" ]
let no_hs_main = dopt Opt_NoHsMain dflags
let main_lib | no_hs_main = []
| otherwise = [ "-lHSrtsmain" ]
- rtsEnabledLib <- if dopt Opt_RtsOptsEnabled dflags
+ rtsEnabledObj <- if dopt Opt_RtsOptsEnabled dflags
then do fn <- mkExtraCObj dflags
["#include \"Rts.h\"",
"const rtsBool rtsOptsEnabled = rtsTrue;"]
then do fn <- mkExtraCObj dflags
["#include \"Rts.h\"",
"const rtsBool rtsOptsEnabled = rtsTrue;"]
@@
-1503,7
+1503,7
@@
linkBinary dflags o_files dep_packages = do
#endif
++ pkg_lib_path_opts
++ main_lib
#endif
++ pkg_lib_path_opts
++ main_lib
- ++ rtsEnabledLib
+ ++ rtsEnabledObj
++ pkg_link_opts
#ifdef darwin_TARGET_OS
++ pkg_framework_path_opts
++ pkg_link_opts
#ifdef darwin_TARGET_OS
++ pkg_framework_path_opts