projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-04-30 09:46:58 by simonmar]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
776703f
..
4627356
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-288,8
+288,8
@@
endif
# thr_p : threaded profiled
# debug : debugging (compile with -g for the C compiler, and -DDEBUG)
# debug_p : debugging profiled
# thr_p : threaded profiled
# debug : debugging (compile with -g for the C compiler, and -DDEBUG)
# debug_p : debugging profiled
-# debug_thr : debugging threaded
-# debug_thr_p : debugging threaded profiled
+# thr_debug : debugging threaded
+# thr_debug_p : debugging threaded profiled
#
ifeq "$(BootingFromHc)" "YES"
GhcRTSWays=
#
ifeq "$(BootingFromHc)" "YES"
GhcRTSWays=
@@
-364,11
+364,6
@@
GhcRtsCcOpts=-fomit-frame-pointer
# Include the front panel code? Needs GTK+.
GhcRtsWithFrontPanel = NO
# Include the front panel code? Needs GTK+.
GhcRtsWithFrontPanel = NO
-# DEPRECATED:
-# This option is no longer used. We now always build the threaded RTS,
-# add the flag '-threaded' to GHC to get it.
-GhcRtsThreaded=@ThreadedRts@
-
################################################################################
#
# libraries project
################################################################################
#
# libraries project
@@
-411,6
+406,7
@@
GLUT_LIBS=@GLUT_LIBS@
# X11 stuff
#
# X11 stuff
#
+GhcLibsWithX11=@GhcLibsWithX11@
X_CFLAGS=@X_CFLAGS@
X_LIBS=@X_LIBS@
X_CFLAGS=@X_CFLAGS@
X_LIBS=@X_LIBS@
@@
-1062,6
+1058,14
@@
WAY_debug_HC_OPTS=-optc-DDEBUG
WAY_debug_p_NAME=debug profiled
WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
WAY_debug_p_NAME=debug profiled
WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
+# Way 'thr_debug':
+WAY_thr_debug_NAME=threaded
+WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG
+
+# Way 'thr_debug_p':
+WAY_thr_debug_p_NAME=threaded
+WAY_thr_debug_p_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG -prof
+
#
# Add user-way configurations here:
#
#
# Add user-way configurations here:
#