[project @ 2000-08-07 16:09:03 by rrt]

Add COMPILING_STDLIB symbol analagous to COMPILING_RTS for the extern vars
in stgio.h.

diff --git a/ghc/includes/StgDLL.h b/ghc/includes/StgDLL.h
index 599d9e8..9a0730a 100644 (file)
--- a/ghc/includes/StgDLL.h
+++ b/ghc/includes/StgDLL.h
@@ -41,4 +41,10 @@
 # endif
 #endif
 
+#ifdef COMPILING_STDLIB
+#define DLL_IMPORT_STDLIB
+#else
+#define DLL_IMPORT_STDLIB DLLIMPORT
+#endif
+
 #endif /* __STGDLL_H__ */

diff --git a/ghc/lib/std/cbits/Makefile b/ghc/lib/std/cbits/Makefile
index 44d1ac2..4e43033 100644 (file)
--- a/ghc/lib/std/cbits/Makefile
+++ b/ghc/lib/std/cbits/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2000/07/09 16:06:28 panne Exp $
+# $Id: Makefile,v 1.23 2000/08/07 16:09:03 rrt Exp $
 
 TOP = ../../..
 include $(TOP)/mk/boilerplate.mk
@@ -34,6 +34,7 @@ DLL_IMPLIB_NAME = libHSstd_cbits_imp.a
 DLL_DESCRIPTION = "Haskell Prelude helpers"
 SRC_BLD_DLL_OPTS += --export-all --output-def=HSstdcbits.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lgmp -L. -L../../../rts/gmp -L../../../rts
+SRC_CC_OPTS += -optc-DCOMPILING_STDLIB
 
 #
 # Compile the files using the Haskell compiler (ghc really).