projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46809fa
)
Remove unused variables from the build system: HBC, NHC, MKDEPENDHS
author
Ian Lynagh
<igloo@earth.li>
Wed, 24 Nov 2010 14:00:52 +0000
(14:00 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Wed, 24 Nov 2010 14:00:52 +0000
(14:00 +0000)
configure.ac
patch
|
blob
|
history
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
5e88777
..
b943d4d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-381,9
+381,6
@@
AC_ARG_WITH(hc,
)
AC_SUBST(WithHc)
)
AC_SUBST(WithHc)
-AC_PATH_PROGS(NHC,nhc nhc98)
-AC_PATH_PROG(HBC,hbc)
-
# This uses GHC, so put it after the "GHC is required" check above:
FP_INTREE_GHC_PWD
FP_FIND_ROOT
# This uses GHC, so put it after the "GHC is required" check above:
FP_INTREE_GHC_PWD
FP_FIND_ROOT
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
cc4d767
..
1488171
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-457,12
+457,9
@@
GENERATED_FILE = chmod a-w
EXECUTABLE_FILE = chmod +x
#-----------------------------------------------------------------------------
EXECUTABLE_FILE = chmod +x
#-----------------------------------------------------------------------------
-# Haskell compilers and mkdependHS
+# Installed GHC
-# $(GHC), $(HBC) and $(NHC) point to installed versions of the relevant
-# compilers, if available.
-#
-# $(MKDEPENDHS) is the Haskell dependency generator (ghc -M).
+# $(GHC) points to installed version of the compiler.
#
# NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead
# (because the version numbers have to be calculated).
#
# NOTE: Don't override $(GHC) in build.mk, use configure --with-ghc instead
# (because the version numbers have to be calculated).
@@
-480,9
+477,6
@@
GhcDir = $(dir $(GHC))
# Set to YES if $(GHC) has the editline package installed
GhcHasEditline = @GhcHasEditline@
# Set to YES if $(GHC) has the editline package installed
GhcHasEditline = @GhcHasEditline@
-HBC = @HBC@
-NHC = @NHC@
-
# Sometimes we want to invoke ghc from the build tree in different
# places (eg. it's handy to have a nofib & a ghc build in the same
# tree). We can refer to "this ghc" as $(GHC_INPLACE):
# Sometimes we want to invoke ghc from the build tree in different
# places (eg. it's handy to have a nofib & a ghc build in the same
# tree). We can refer to "this ghc" as $(GHC_INPLACE):