X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=4627356b7e4b28f8107f1554d38dbed64dfdf206;hb=b45779d16382c86ece0fbfae6bbdd99a1eae6965;hp=776703f4ea23232fb1722a40edf445d4cdc7178f;hpb=ae8e4261799358bfbb88dfd251b2e9e25dc39182;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 776703f..4627356 100644
--- 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
-#   debug_thr   : debugging threaded
-#   debug_thr_p : debugging threaded profiled
+#   thr_debug   : debugging threaded
+#   thr_debug_p : debugging threaded profiled
 #
 ifeq "$(BootingFromHc)" "YES"
 GhcRTSWays=
@@ -364,11 +364,6 @@ GhcRtsCcOpts=-fomit-frame-pointer
 # 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
@@ -411,6 +406,7 @@ GLUT_LIBS=@GLUT_LIBS@
 
 # X11 stuff
 #
+GhcLibsWithX11=@GhcLibsWithX11@
 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 '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:
 #