projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d282b3c
)
Windows: load msvcrt and kernel32 manually
author
Simon Marlow
<marlowsd@gmail.com>
Wed, 20 May 2009 12:43:10 +0000
(12:43 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Wed, 20 May 2009 12:43:10 +0000
(12:43 +0000)
rts/Linker.c
patch
|
blob
|
history
diff --git
a/rts/Linker.c
b/rts/Linker.c
index
347bfa6
..
8acf818
100644
(file)
--- a/
rts/Linker.c
+++ b/
rts/Linker.c
@@
-1054,6
+1054,16
@@
initLinker( void )
mmap_32bit_base = (void*)RtsFlags.MiscFlags.linkerMemBase;
}
#endif
+
+#if defined(mingw32_HOST_OS)
+ /*
+ * These two libraries cause problems when added to the static link,
+ * but are necessary for resolving symbols in GHCi, hence we load
+ * them manually here.
+ */
+ addDLL("msvcrt");
+ addDLL("kernel32");
+#endif
}
/* -----------------------------------------------------------------------------