[project @ 2001-03-05 10:29:00 by simonmar]

[ghc-hetmet.git] / ghc / mk / paths.mk

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index e2ca2b1..40ade63 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: paths.mk,v 1.16 2000/01/10 11:08:04 simonmar Exp $
+# $Id: paths.mk,v 1.29 2001/03/05 10:29:00 simonmar Exp $
 #
 # ghc project specific make variables
 #
@@ -25,31 +25,20 @@ GHC_INCLUDE_DIR     := $(TOP)/includes
 GHC_UTILS_DIR          := $(TOP)/utils
 GHC_INTERPRETER_DIR    := $(TOP)/interpreter
 
-GHC_INPLACE            := $(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
-GHC_HSC_DIR            := $(GHC_COMPILER_DIR)
-GHC_SYSMAN             := $(GHC_RUNTIME_DIR)/gum/SysMan
-GHC_SYSMAN_DIR                 := $(GHC_RUNTIME_DIR)/gum
-
 GHC_UNLIT_DIR          := $(GHC_UTILS_DIR)/unlit
-UNLIT                  := $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT              := $(GHC_UNLIT_DIR)/unlit
+GHC_MANGLER_DIR        := $(GHC_DRIVER_DIR)/mangler
+GHC_SPLIT_DIR          := $(GHC_DRIVER_DIR)/split
+
+GHC_UNLIT              = $(GHC_UNLIT_DIR)/unlit$(EXE_SUFFIX)
+GHC_MANGLER            = $(GHC_MANGLER_DIR)/ghc-asm
+GHC_SPLIT              = $(GHC_SPLIT_DIR)/ghc-split
+
+GHC_SYSMAN             = $(GHC_RUNTIME_DIR)/parallel/SysMan
+GHC_SYSMAN_DIR                 = $(GHC_RUNTIME_DIR)/parallel
 
 #-----------------------------------------------------------------------------
 # Stuff for the C-compiling phase in particular...
 
-ifeq ($(HaveGcc), YES)
-GHC_OPT_HILEV_ASM              = $(WhatGccIsCalled)
-else
-GHC_OPT_HILEV_ASM              = $(CC)
-endif
-
 #
 # There's no need to compute dependencies when booting from .hc files
 #