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-12-01 14:19:36 by simonmar]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
ab4fd5a
..
a2f6a65
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-110,11
+110,11
@@
exeext=@exeext@
# * ghc next
# then it's up to you
# * ghc next
# then it's up to you
-ProjectsToBuild = glafp-utils ghc
+ProjectsToBuild = glafp-utils ghc hslibs
#
# Make a distinction between building and installing
#
#
# Make a distinction between building and installing
#
-ProjectsToInstall = glafp-utils ghc
+ProjectsToInstall = glafp-utils ghc hslibs
#
# Should the various project tests directories be built?
#
# Should the various project tests directories be built?
@@
-147,7
+147,7
@@
IncludeTestDirsInBuild=NO
# HC_ROJEMO_NHC
# HC_UNSPECIFIED
# HC_ROJEMO_NHC
# HC_UNSPECIFIED
-WithGhcHc = @WithGhcHc@
+WithGhcHc = @WithHc@
# Variable which is set to the version number of the $(WithGhcHc) we're using.
# Not currently used, but might come in handy sometime soon.
# Variable which is set to the version number of the $(WithGhcHc) we're using.
# Not currently used, but might come in handy sometime soon.
@@
-160,11
+160,9
@@
GhcCompilerWays=
# Extra option flags to pass to the compiler that compiles the compiler
# (Ones that are essential are wired into ghc/compiler/Makefile)
# Typical ones:
# Extra option flags to pass to the compiler that compiles the compiler
# (Ones that are essential are wired into ghc/compiler/Makefile)
# Typical ones:
-# -H25m allocate a bigger heap (default is 6m)
+# -H25m allocate a bigger heap (might speed up compilation)
#
# -O compile an optimised compiler
#
# -O compile an optimised compiler
-# NB! If you add -O you'll almost certainly need to increase
-# the amount of heap space too (to 15m or more)
#
# -DDEBUG include consistency/assertion checks in the compiled compiler
#
#
# -DDEBUG include consistency/assertion checks in the compiled compiler
#
@@
-175,13
+173,6
@@
GhcHcOpts=
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
GhcWithHscBuiltViaC=@BootingFromHc@
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
GhcWithHscBuiltViaC=@BootingFromHc@
-# Build hsc with -O and turn optimising flag on when compiling
-# the intermediate C file
-GhcUseGccForOptAsm=YES
-
-# Compile intermediate C file with debugging options set.
-GhcUseGccForDebuggingAsm=YES
-
# Build a registerised version of hsc and runtime
# (unregisterised used for Hugs at the moment)
GhcWithRegisterised=YES
# Build a registerised version of hsc and runtime
# (unregisterised used for Hugs at the moment)
GhcWithRegisterised=YES
@@
-197,7
+188,6
@@
GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha s
# Building various ways?
# (right now, empty if not).
BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
# Building various ways?
# (right now, empty if not).
BuildingParallel=$(subst mp,YES,$(filter mp,$(WAYS)))
-BuildingProfiling=$(subst p,YES,$(filter p,$(WAYS)))
BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
#---------------------------------------------------------------
BuildingGranSim=$(subst mg,YES,$(filter mg,$(WAYS)))
#---------------------------------------------------------------
@@
-243,10
+233,7
@@
GhcLibsWithReadline=NO
# (no path == in standard include path)
#
ReadlineIncludePath=
# (no path == in standard include path)
#
ReadlineIncludePath=
-
-# Build the socket libraries? (ToDo: is this used?)
-#
-GhcLibsWithSockets=YES
+HaveLibReadline=@HaveLibReadline@
# Strip local symbols from libraries? This can make the libraries smaller,
# but makes debugging somewhat more difficult. Doesn't work with all ld's.
# Strip local symbols from libraries? This can make the libraries smaller,
# but makes debugging somewhat more difficult. Doesn't work with all ld's.
@@
-271,7
+258,7
@@
EnableWin32DLLs=@EnableWin32DLLs@
#################################################################################
# The compiler you'd like to use to compile Happy
#################################################################################
# The compiler you'd like to use to compile Happy
-WithHappyHc = $(WithGhcHc)
+WithHappyHc = @WithHc@
# HappyHcOpts gives the flags to pass to the Haskell compiler used
# to compile the Happy sources with.
# HappyHcOpts gives the flags to pass to the Haskell compiler used
# to compile the Happy sources with.
@@
-481,7
+468,8
@@
HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/
#-----------------------------------------------------------------------------
# Haskell compiler and mkdependHS
#-----------------------------------------------------------------------------
# Haskell compiler and mkdependHS
-HC = $(FPTOOLS_TOP)/ghc/driver/ghc
+# ToDo: $(HC) should be a local installation of some Haskell compiler
+HC = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
MKDEPENDHS = $(HC)
#-----------------------------------------------------------------------------
MKDEPENDHS = $(HC)
#-----------------------------------------------------------------------------
@@
-529,7
+517,7
@@
CONTEXT_DIFF = @ContextDiffCmd@
CP = cp
CPP = @CPP@
CTAGS = $(ETAGS)
CP = cp
CPP = @CPP@
CTAGS = $(ETAGS)
-RAWCPP = @RAWCPP@
+RAWCPP = $(CPP) -undef -traditional
INSTALL = @INSTALL@
#
# Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
INSTALL = @INSTALL@
#
# Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
@@
-689,7
+677,7
@@
HSTAGS = $(HSTAGS_PREFIX)hstags
#
# The ways currently defined.
#
#
# The ways currently defined.
#
-ALL_WAYS=p t u mp mg a b c d e f g h i j k l m n o A B
+ALL_WAYS=p t u s mp mg a b c d e f g h i j k l m n o A B
#
# The following ways currently have treated specially, p u t mg,
#
# The following ways currently have treated specially, p u t mg,
@@
-711,6
+699,10
@@
WAY_t_HC_OPTS= -ticky
WAY_u_NAME=unregisterized (using portable C only)
WAY_u_HC_OPTS=-unreg
WAY_u_NAME=unregisterized (using portable C only)
WAY_u_HC_OPTS=-unreg
+# Way `s':
+WAY_s_NAME=threads (for SMP)
+WAY_s_HC_OPTS=-smp
+
# Way `mp':
WAY_mp_NAME=parallel
WAY_mp_HC_OPTS=-parallel
# Way `mp':
WAY_mp_NAME=parallel
WAY_mp_HC_OPTS=-parallel