X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fpaths.mk;h=bf10fec36523ab04db9c878ab4136aad4a2674f8;hb=67fe852eb2e9b3a489b62cbf9259b5a868db5468;hp=3a69dd0d8e9bdd1271fc605b6291fef85bca312b;hpb=e3f0d880b7b74ed95059a8cddf3edf3e0d2f83c6;p=ghc-hetmet.git

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index 3a69dd0..bf10fec 100644
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -3,16 +3,6 @@
 # ghc project specific make variables
 #
 
-#
-PROJECTVERSION=$(GhcProjectVersion)
-PROJECTNAME=$(GhcProjectName)
-PROJECTPATCHLEVEL=$(GhcProjectPatchLevel)
-
-
-# Override default haskell compiler if required
-#HC			= $(WithGhcHc)
-HaskellCompilerType	= $(WithGhcHcType)
-
 GCap=-optc-DGCap
 #GC2s=-optc-DGC2s
 #GC1s=-optc-DGC1s
@@ -47,14 +37,16 @@ endif
 
 GHC_DRIVER_DIR	    	= $(TOP)/driver
 GHC_COMPILER_DIR  	= $(TOP)/compiler
-GHC_RUNTIME_DIR   	= $(TOP)/runtime
+GHC_RUNTIME_DIR   	= $(TOP)/rts
 GHC_LIB_DIR	 	= $(TOP)/lib
 GHC_INCLUDE_DIR   	= $(TOP)/includes
 GHC_UTILS_DIR	 	= $(TOP)/utils
 
-GHC 			= $(GHC_DRIVER_DIR)/ghc
+GHC 			= $(GHC_DRIVER_DIR)/ghc-inplace
 GHC_HSCPP_DIR 		= $(GHC_UTILS_DIR)/hscpp
 GHC_HSCPP    		= $(GHC_HSCPP_DIR)/hscpp
+GHC_MKDEPENDHS_DIR	= $(GHC_UTILS_DIR)/mkdependHS
+GHC_MKDEPENDHS 		= $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
 GHC_HSP    		= $(GHC_HSP_DIR)/hsp
 GHC_HSP_DIR 		= $(GHC_HSC_DIR)
 GHC_HSC    		= $(GHC_HSC_DIR)/hsc
@@ -65,21 +57,17 @@ GHC_SYSMAN_DIR 		= $(GHC_RUNTIME_DIR)/gum
 #-----------------------------------------------------------------------------
 # Stuff for the C-compiling phase in particular...
 
-# NON-OPTIMISING C COMPILATION: =================================
-
-ifeq ($(HaveGcc), YES)
-GHC_DEBUG_HILEV_ASM 		= $(WhatGccIsCalled)
-else
-GHC_DEBUG_HILEV_ASM 		= $(CC)
-endif
-
-# OPTIMISING C COMPILATION (regs, etc): ==========================
-
 ifeq ($(HaveGcc), YES)
 GHC_OPT_HILEV_ASM 		= $(WhatGccIsCalled)
-GHC_GCC_IS_AVAILABLE 		= 1
 else
 GHC_OPT_HILEV_ASM 		= $(CC)
-GHC_GCC_IS_AVAILABLE 		= 0
 endif
 
+#
+# There's no need to compute dependencies when booting from .hc files
+#
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+MKDEPENDHS_SRCS = $(HS_SRCS)
+else
+MKDEPENDHS_SRCS =
+endif