projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1997-12-05 09:26:36 by simonm]
[ghc-hetmet.git]
/
ghc
/
driver
/
Makefile
diff --git
a/ghc/driver/Makefile
b/ghc/driver/Makefile
index
f10f13f
..
c6c02f1
100644
(file)
--- a/
ghc/driver/Makefile
+++ b/
ghc/driver/Makefile
@@
-1,5
+1,5
@@
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.5 1997/03/24 04:33:30 sof Exp $
+#
TOP=..
CURRENT_DIR=ghc/driver
TOP=..
CURRENT_DIR=ghc/driver
@@
-57,7
+57,7
@@
SCRIPT_SUBST_VARS := \
ifeq "$(BIN_DIST)" "1"
SCRIPT_PREFIX_FILES=prefix.txt
else
ifeq "$(BIN_DIST)" "1"
SCRIPT_PREFIX_FILES=prefix.txt
else
-SCRIPT_SUBST_VARS += libdir datadir bindir TOP_PWD
+SCRIPT_SUBST_VARS += libdir libexecdir datadir bindir TOP_PWD
endif
all :: $(DYN_LOADABLE_BITS)
endif
all :: $(DYN_LOADABLE_BITS)
@@
-70,7
+70,7
@@
all :: $(DYN_LOADABLE_BITS)
# ToDo: allow different install name for driver?
#
INSTALL_SCRIPTS += $(SCRIPT_PROG)
# ToDo: allow different install name for driver?
#
INSTALL_SCRIPTS += $(SCRIPT_PROG)
-INSTALL_LIBS += $(DYN_LOADABLE_BITS)
+INSTALL_LIBS += $(DYN_LOADABLE_BITS)
#
# Before really installing the driver, we have to
#
# Before really installing the driver, we have to
@@
-109,6
+109,10
@@
install ::
#
# Option vars for the special ways (that the driver has special pleading for).
#
#
# Option vars for the special ways (that the driver has special pleading for).
#
+# ToDo: rename -DPROFILING to -D__SCC_PROFILING (or somesuch)
+# -DTICKY-TICKY TO __TICKY_TICKY__
+#
+# (this is to make the naming consistent with other `standard' hscpp #defines )
# Way p:
WAY_p_NAME=profiling
# Way p:
WAY_p_NAME=profiling
@@
-124,25
+128,25
@@
WAY_u_HC_OPTS=
# Way `mc': concurrent
WAY_mc_NAME=concurrent
# Way `mc': concurrent
WAY_mc_NAME=concurrent
-WAY_mc_HC_OPTS+=-fstack-check -fconcurrent -D__CONCURRENT_HASKELL__ -DCONCURRENT -optcpp-D__CONCURRENT_HASKELL__ -optcpp-DCONCURRENT
+WAY_mc_HC_OPTS+=-fstack-check -fconcurrent -D__CONCURRENT_HASKELL__ -optc-DCONCURRENT
# Way `mr':
WAY_mr_NAME=profiled concurrent
# Way `mr':
WAY_mr_NAME=profiled concurrent
-WAY_mr_HC_OPTS+=-fstack-check -fconcurrent -fscc-profiling -D__CONCURRENT_HASKELL__ -DCONCURRENT -DPROFILING -optcpp-D__CONCURRENT_HASKELL__ -optcpp-DCONCURRENT -optcpp-DPROFILING
+WAY_mr_HC_OPTS+=-fstack-check -fconcurrent -fscc-profiling -D__CONCURRENT_HASKELL__ -DPROFILING -optc-DCONCURRENT -optc-DPROFILING
# Way `mt':
WAY_mt_NAME=ticky-ticky concurrent
# Way `mt':
WAY_mt_NAME=ticky-ticky concurrent
-WAY_mt_HC_OPTS+=-fstack-check -fconcurrent -fticky-ticky -D__CONCURRENT_HASKELL__ -DCONCURRENT -DTICKY-TICKY -optc-D__CONCURRENT_HASKELL__ -optc-DCONCURRENT -optc-DTICKY_TICKY
+WAY_mt_HC_OPTS+=-fstack-check -fconcurrent -fticky-ticky -D__CONCURRENT_HASKELL__ -DTICKY-TICKY -optc-DCONCURRENT -optc-DTICKY_TICKY
# Way `mp':
WAY_mp_NAME=parallel
# Way `mp':
WAY_mp_NAME=parallel
-WAY_mp_HC_OPTS+=-fstack-check -fconcurrent -D__PARALLEL_HASKELL__ -DPAR -optcpp-D__PARALLEL_HASKELL__ -optc-DPAR -optc-DCONCURRENT
+WAY_mp_HC_OPTS+=-fstack-check -fconcurrent -D__PARALLEL_HASKELL__ -optc-DPAR -optc-DCONCURRENT
#
# Way `mg':
#
# Way `mg':
-# Q: is passing -D__GRANSIM__ and -DGRAN to hscpp needed?
+# Q: is passing -D__GRANSIM__ and -DGRAN to hscpp needed? No, just -D__GRANSIM__
WAY_mg_NAME=GranSim
WAY_mg_NAME=GranSim
-WAY_mg_HC_OPTS+=-fstack-check -fconcurrent -fgransim -D__GRANSIM__ -DGRAN -optcpp-D__GRANSIM__ -optc-DGRAN -optc-D__CONCURRENT_HASKELL__ -optc-DCONCURRENT
+WAY_mg_HC_OPTS+=-fstack-check -fconcurrent -fgransim -D__GRANSIM__ -D__CONCURRENT_HASKELL__ -optc-DCONCURRENT -optc-DGRAN
#
# Ways for different garbage collectors
#
# Ways for different garbage collectors