Bootstrapping

[Ian Lynagh]

Hi,

When bootstrapping a new arch using 6.2 it looked like the removal of
hslibs from the bootstrapping libraries meant genprimopcode (IIRC)
wouldn't build because there was no parsec. I'm not sure if the attached
patch is exactly right, but it seemed sufficient.


Thanks
Ian

-------------- next part --------------
--- orig/mk/bootstrap.mk	2003-09-02 10:23:30.000000000 +0000
+++ new/mk/bootstrap.mk	2004-01-21 13:27:56.000000000 +0000
@@ -68,7 +68,7 @@
 
 HC_BOOT_CC_OPTS = $(PLATFORM_HC_BOOT_CC_OPTS) $(PLATFORM_CC_OPTS) $(CC_OPTS)
 
-SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include
+SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/ghc/includes -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include -I$(FPTOOLS_TOP_ABS)/libraries/parsec/include
 
 ifeq "$(GhcWithInterpreter)" "YES"
 SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/libraries/readline/include
@@ -98,6 +98,7 @@
 HC_BOOT_LD_OPTS += \
    -L$(FPTOOLS_TOP_ABS)/libraries/haskell-src	\
    -L$(FPTOOLS_TOP_ABS)/libraries/readline	\
+   -L$(FPTOOLS_TOP_ABS)/libraries/parsec        \
    -L$(FPTOOLS_TOP_ABS)/libraries/unix          \
    -L$(FPTOOLS_TOP_ABS)/libraries/unix/cbits
 endif
@@ -142,7 +143,7 @@
 HC_BOOT_LIBS += -lHSreadline -lHShaskell-src -lHSunix -lHSunix_cbits
 endif
 
-HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
+HC_BOOT_LIBS += -lHShaskell98 -lHSbase -lHSbase_cbits -lHSparsec -lHSrts -lgmp -lm $(EXTRA_HC_BOOT_LIBS)
 
 ifeq "$(GhcLibsWithReadline)" "YES"
 HC_BOOT_LIBS += $(patsubst %, -l%, $(LibsReadline))