[project @ 2001-03-23 16:36:20 by simonmar]

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

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index d7b30e7..51d5ebc 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -1,20 +1,9 @@
 # -----------------------------------------------------------------------------
+# $Id: paths.mk,v 1.30 2001/03/23 16:36:22 simonmar Exp $
 #
 # ghc project specific make variables
 #
 
-# Override default haskell compiler if required
-#HC                    = $(WithGhcHc)
-HaskellCompilerType    = $(WithGhcHcType)
-
-# What ways to build the RTS+libs
-WAYS=$(GhcLibWays)
-
-
-MKDEPENDHSSRC          = $(GHC_UTILS_DIR)/mkdependHS
-UNLIT                  = $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT_DIR          = $(GHC_UTILS_DIR)/unlit
-
 #-----------------------------------------------------------------------------
 # HsTags
 
@@ -26,53 +15,23 @@ HSTAGS_DIR          = $(GHC_UTILS_DIR)/hstags
 endif
 
 #-----------------------------------------------------------------------------
-# Ugen
-
-ifdef UseInstalledUtils
-UGEN           =  ugen
-else
-UGEN           = $(UGEN_DIR)/ugen
-UGENSRC        = $(GHC_UTILS_DIR)/ugen
-endif
-
-#-----------------------------------------------------------------------------
 # Extra things ``only for'' for the ghc project
 
-GHC_DRIVER_DIR         = $(TOP)/driver
-GHC_COMPILER_DIR       = $(TOP)/compiler
-GHC_RUNTIME_DIR        = $(TOP)/runtime
-GHC_LIB_DIR            = $(TOP)/lib
-GHC_INCLUDE_DIR        = $(TOP)/includes
-GHC_UTILS_DIR          = $(TOP)/utils
+GHC_DRIVER_DIR         := $(TOP)/driver
+GHC_COMPILER_DIR       := $(TOP)/compiler
+GHC_RUNTIME_DIR        := $(TOP)/rts
+GHC_LIB_DIR            := $(TOP)/lib
+GHC_INCLUDE_DIR        := $(TOP)/includes
+GHC_UTILS_DIR          := $(TOP)/utils
+GHC_INTERPRETER_DIR    := $(TOP)/interpreter
 
-GHC                    = $(GHC_DRIVER_DIR)/ghc
-GHC_HSCPP_DIR          = $(GHC_UTILS_DIR)/hscpp
-GHC_HSCPP              = $(GHC_HSCPP_DIR)/hscpp
-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
+GHC_MANGLER_DIR        := $(GHC_DRIVER_DIR)/mangler
+GHC_SPLIT_DIR          := $(GHC_DRIVER_DIR)/split
 
-#-----------------------------------------------------------------------------
-# 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
+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