X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7d96616f58a6e5145b7947dd382704eac40a50f3;hb=b9b6e38a1ebb5f05b382609fe0776d91cdd1090b;hp=6078fbaf9a408fadc9114edc337e79b458b3a3ac;hpb=e8ceccfea9c447b898dae9ff2df4a943bbf62bd8;p=haskell-directory.git

diff --git a/Makefile b/Makefile
index 6078fba..7d96616 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,8 @@ ALL_DIRS = \
 	Control/Monad \
 	Control/Monad/ST \
 	Data \
+	Data/ByteString \
+	Data/ByteString/Lazy \
 	Data/Generics \
 	Data/Array \
 	Data/Array/IO \
@@ -40,7 +42,7 @@ PACKAGE = base
 VERSION = 1.0
 
 SRC_HC_OPTS += -fglasgow-exts -cpp -Iinclude -"\#include" HsBase.h
-SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
+SRC_HSC2HS_OPTS += -Iinclude -I$(GHC_INCLUDE_DIR)
 
 # -----------------------------------------------------------------------------
 # Per-module flags
@@ -48,14 +50,10 @@ SRC_HSC2HS_OPTS += -Iinclude -I$(FPTOOLS_TOP)/ghc/includes
 # ESSENTIAL, for getting reasonable performance from the I/O library:
 SRC_HC_OPTS += -funbox-strict-fields
 
-# Grrr, gcc-4.1.0 has a bug in -O2 and higher that causes miscompilation of
-# GHC.Show.itos.  See gcc bug #26824.  We must drop back to -O1.
-GHC/Show_HC_OPTS += -optc-O1
-
 # -----------------------------------------------------------------------------
 # PrimOpWrappers
 
-# These two lines are required for pre-processing ghc/compiler/prelude/primops.txt
+# These two lines are required for pre-processing compiler/prelude/primops.txt
 SRC_CPP_OPTS += -I$(GHC_INCLUDE_DIR)
 SRC_CPP_OPTS += ${GhcCppOpts}
 
@@ -65,12 +63,12 @@ GHC/PrimopWrappers.hs: GHC/Prim.hs
 else
 GHC/PrimopWrappers.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt GHC/Prim.hs
 	@$(RM) $@
-	$(GHC_GENPRIMOP) --make-haskell-wrappers < $< > $@
+	$(GENPRIMOP) --make-haskell-wrappers < $< > $@
 endif
 
 GHC/Prim.hs: $(GHC_COMPILER_DIR)/prelude/primops.txt
 	@$(RM) $@
-	$(GHC_GENPRIMOP) --make-haskell-source < $< > $@
+	$(GENPRIMOP) --make-haskell-source < $< > $@
 
 EXCLUDED_SRCS = GHC/Prim.hs
 EXTRA_HADDOCK_SRCS = GHC/Prim.hs
@@ -84,7 +82,7 @@ CLEAN_FILES += GHC/PrimopWrappers.hs
 ifneq "$(BootingFromHc)" "YES"
 STUBOBJS += \
    Control/Concurrent_stub.$(way_)o
-   
+
 CLEAN_FILES += $(STUBOBJS) \
    Control/Concurrent_stub.[ch]
 endif