[project @ 1998-02-17 11:30:36 by simonm]

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

diff --git a/ghc/mk/paths.mk b/ghc/mk/paths.mk
index d7b30e7..f995c40 100644 (file)
--- a/ghc/mk/paths.mk
+++ b/ghc/mk/paths.mk
@@ -7,12 +7,13 @@
 #HC                    = $(WithGhcHc)
 HaskellCompilerType    = $(WithGhcHcType)
 
-# What ways to build the RTS+libs
-WAYS=$(GhcLibWays)
-
+GCap=-optc-DGCap
+#GC2s=-optc-DGC2s
+#GC1s=-optc-DGC1s
 
 MKDEPENDHSSRC          = $(GHC_UTILS_DIR)/mkdependHS
 UNLIT                  = $(GHC_UNLIT_DIR)/unlit
+GHC_UNLIT              = $(GHC_UNLIT_DIR)/unlit
 GHC_UNLIT_DIR          = $(GHC_UTILS_DIR)/unlit
 
 #-----------------------------------------------------------------------------
@@ -29,10 +30,10 @@ endif
 # Ugen
 
 ifdef UseInstalledUtils
-UGEN           =  ugen
+UGEN           = ugen
 else
 UGEN           = $(UGEN_DIR)/ugen
-UGENSRC        = $(GHC_UTILS_DIR)/ugen
+UGEN_DIR       = $(GHC_UTILS_DIR)/ugen
 endif
 
 #-----------------------------------------------------------------------------
@@ -58,21 +59,9 @@ 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