X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fbootstrap.mk;h=e1eb3a723bef3334baa11650343d475234431793;hb=3a7fa9bb3cee6c1b4c26bc5ba91f9afe97fa502f;hp=5bbc41f567ba99d69a41e9e9540c2902aedbea07;hpb=c0dabc3ec372bc8f66d761a28cf411ada297ea76;p=ghc-hetmet.git

diff --git a/mk/bootstrap.mk b/mk/bootstrap.mk
index 5bbc41f..e1eb3a7 100644
--- a/mk/bootstrap.mk
+++ b/mk/bootstrap.mk
@@ -8,17 +8,6 @@
 # compile the .hc files, so we have to duplicate that functionality here.
 # The result is unfortunately ugly, but we don't have another choice.
 
-TOP_SAVED := $(TOP)
-TOP:=$(TOP)/ghc
-
-include $(TOP)/mk/version.mk
-include $(TOP)/mk/paths.mk
-
-# Reset TOP
-TOP:=$(TOP_SAVED)
-
-include $(TOP)/mk/suffix.mk
-
 # -----------------------------------------------------------------------------
 # Set the platform-specific options to send to the C compiler.  These should
 # match the list in machdepCCOpts in ghc/compiler/DriverFlags.hs.
@@ -67,7 +56,7 @@ PLATFORM_CC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 
 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 -I$(FPTOOLS_TOP_ABS)/libraries/parsec/include
+SRC_CC_OPTS += -I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL) -I$(FPTOOLS_TOP_ABS)/libraries/base/include -I$(FPTOOLS_TOP_ABS)/libraries/unix/include -I$(FPTOOLS_TOP_ABS)/libraries/parsec/include
 
 # C code compiled with UseGhcForCc=YES assumes the existence of certain CPP
 # symbols defined by GHC (eg. __GLASGOW_HASKELL__), so we better make sure
@@ -89,11 +78,11 @@ UNDERSCORE=
 endif
 
 ifeq "$(HaveLibGmp)" "NO"
-DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/ghc/rts/gmp
+DASH_L_GHC_RTS_GMP_DIR=-L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)/gmp
 endif
 
 HC_BOOT_LD_OPTS =				\
-   -L$(FPTOOLS_TOP_ABS)/ghc/rts			\
+   -L$(FPTOOLS_TOP_ABS)/$(GHC_RTS_DIR_REL)	\
    $(DASH_L_GHC_RTS_GMP_DIR)                    \
    -L$(FPTOOLS_TOP_ABS)/libraries/base		\
    -L$(FPTOOLS_TOP_ABS)/libraries/base/cbits	\