projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-10-05 10:30:26 by simonmar]
[ghc-hetmet.git]
/
ghc
/
mk
/
paths.mk
diff --git
a/ghc/mk/paths.mk
b/ghc/mk/paths.mk
index
3a69dd0
..
bf10fec
100644
(file)
--- a/
ghc/mk/paths.mk
+++ b/
ghc/mk/paths.mk
@@
-3,16
+3,6
@@
# ghc project specific make variables
#
# 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
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_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
-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_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_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...
#-----------------------------------------------------------------------------
# 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