projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1998-12-03 15:24:08 by simonm]
[ghc-hetmet.git]
/
ghc
/
mk
/
paths.mk
diff --git
a/ghc/mk/paths.mk
b/ghc/mk/paths.mk
index
635956a
..
58331ad
100644
(file)
--- a/
ghc/mk/paths.mk
+++ b/
ghc/mk/paths.mk
@@
-3,13
+3,6
@@
# ghc project specific make variables
#
# ghc project specific make variables
#
-# Override default haskell compiler if required
-#HC = $(WithGhcHc)
-HaskellCompilerType = $(WithGhcHcType)
-
-# What ways to build the RTS+libs
-WAYS=$(GhcLibWays)
-
GCap=-optc-DGCap
#GC2s=-optc-DGC2s
#GC1s=-optc-DGC1s
GCap=-optc-DGCap
#GC2s=-optc-DGC2s
#GC1s=-optc-DGC1s
@@
-44,7
+37,7
@@
endif
GHC_DRIVER_DIR = $(TOP)/driver
GHC_COMPILER_DIR = $(TOP)/compiler
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_LIB_DIR = $(TOP)/lib
GHC_INCLUDE_DIR = $(TOP)/includes
GHC_UTILS_DIR = $(TOP)/utils
@@
-62,21
+55,17
@@
GHC_SYSMAN_DIR = $(GHC_RUNTIME_DIR)/gum
#-----------------------------------------------------------------------------
# Stuff for the C-compiling phase in particular...
#-----------------------------------------------------------------------------
# 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)
ifeq ($(HaveGcc), YES)
GHC_OPT_HILEV_ASM = $(WhatGccIsCalled)
-GHC_GCC_IS_AVAILABLE = 1
else
GHC_OPT_HILEV_ASM = $(CC)
else
GHC_OPT_HILEV_ASM = $(CC)
-GHC_GCC_IS_AVAILABLE = 0
endif
endif
+#
+# There's no need to compute dependencies when booting from .hc files
+#
+ifneq "$(GhcWithHscBuiltViaC)" "YES"
+MKDEPENDHS_SRCS = $(HS_SRCS)
+else
+MKDEPENDHS_SRCS =
+endif