[hoc-cvs] hoc/HOC HOC-macos.conf,1.4,1.5 HOC-macos.conf-inplace,1.4,1.5 HOC.hs,1.6,1.7 Makefile.in,1.7,1.8

[Andre P. <at...@us...>]

Update of /cvsroot/hoc/hoc/HOC
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18523/HOC

Modified Files:
	HOC-macos.conf HOC-macos.conf-inplace HOC.hs Makefile.in 
Log Message:
Get HOC/ and InterfaceGenerator/ subdirectories compiling with GHC 6.4



Index: Makefile.in
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/Makefile.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.in	6 Dec 2004 03:46:51 -0000	1.7
+++ Makefile.in	31 Mar 2005 15:30:18 -0000	1.8
@@ -14,7 +14,7 @@
 all: libHOC.a HOC.o ../inplace.conf
 
 ../inplace.conf: HOC-$(PLATFORM).conf-inplace
-	$(GHC_PKG) unregister --force --package-conf=../inplace.conf HOC || true
+	echo "[]" > $@
 	$(GHC_PKG) register HOC-$(PLATFORM).conf-inplace \
 		--package-conf=../inplace.conf
 
@@ -30,12 +30,28 @@
 
 ghcmake: ghcmake.build-stamp
 
+
+# XXX: GHC 6.4 has a really ... _weird_ bug where it won't compile
+# HOC/StdArgumentTypes.hs properly if you just try ghc --make with HOC.hs.
+# There seems to be a problem with GHC's .hi file chasing with
+# HOC/Arguments.hs; obviously the long-term solution is to fix GHC, but for
+# now, we work around it by compiling HOC/Arguments.hs first.
 ghcmake.build-stamp:
 	mkdir -p build/objects
 	mkdir -p build/imports
+	$(GHC) --make HOC/Arguments.hs	\
+		-odir build/objects -hidir build/imports	\
+		-fglasgow-exts -fth \
+		../HOC_cbits/HOC_cbits.o	\
+		-I../HOC_cbits	\
+		-I../libffi-src/build/include	\
+		-ignore-package HOC \
+		$(FOUNDATION_INCLUDES) \
+		$(FOUNDATION_LIBS)      \
+                $(DEFINES)
 	$(GHC) --make HOC.hs	\
 		-odir build/objects -hidir build/imports	\
-		-fglasgow-exts \
+		-fglasgow-exts -fth \
 		../HOC_cbits/HOC_cbits.o	\
 		-I../HOC_cbits	\
 		-I../libffi-src/build/include	\

Index: HOC.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC.hs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- HOC.hs	12 May 2004 05:44:10 -0000	1.6
+++ HOC.hs	31 Mar 2005 15:30:18 -0000	1.7
@@ -38,7 +38,7 @@
         objectMapStatistics,
         
         -- things that shouldn't really be exported
-        InstanceVariables(..),
+        InstanceVariables,
         Typeable(..)
     ) where
 

Index: HOC-macos.conf
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HOC-macos.conf	6 Dec 2004 03:46:51 -0000	1.4
+++ HOC-macos.conf	31 Mar 2005 15:30:17 -0000	1.5
@@ -26,6 +26,6 @@
 library-dirs:       "$libdir/HOC"
 
 hs-libraries:       "HOC", "HOC_cbits"
-extra-libs:         "objc"
-extra-frameworks:   "Foundation"
+extra-libraries:    "objc"
+frameworks:         "Foundation"
 depends:            base, template-haskell

Index: HOC-macos.conf-inplace
===================================================================
RCS file: /cvsroot/hoc/hoc/HOC/HOC-macos.conf-inplace,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HOC-macos.conf-inplace	6 Dec 2004 03:46:51 -0000	1.4
+++ HOC-macos.conf-inplace	31 Mar 2005 15:30:18 -0000	1.5
@@ -27,7 +27,8 @@
                     "../HOC_cbits"
 
 hs-libraries:       "HOC", "HOC_cbits"
-extra-libs:         "objc"
-extra-frameworks:   "Foundation"
+extra-libraries:    "objc"
+frameworks:         "Foundation"
+
 depends:            base, template-haskell