[project @ 2004-02-26 16:21:36 by simonmar]

[ghc-hetmet.git] / ghc / rts / Makefile

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 63fc69e..f18e0a8 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -31,29 +31,9 @@ HC=$(GHC_INPLACE)
 # -----------------------------------------------------------------------------
 # RTS ways
 
-WAYS=$(GhcLibWays) thr debug
+WAYS=$(GhcLibWays) $(GhcRTSWays)
 
-ifneq "$(findstring p, $(GhcLibWays))" ""
-WAYS += thr_p debug_p
-endif
-
-# Way 'thr':
-WAY_thr_NAME=threaded
-WAY_thr_HC_OPTS=-optc-DTHREADED_RTS
-
-# Way 'thr_p':
-WAY_thr_p_NAME=threaded profiled
-WAY_thr_p_HC_OPTS=-optc-DTHREADED_RTS -prof
-
-# Way 'debug':
-WAY_debug_NAME=debug
-WAY_debug_HC_OPTS=-optc-DDEBUG
-
-# Way 'debug_p':
-WAY_debug_p_NAME=debug profiled
-WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
-
-ifneq "$(findstring $(way), debug debug_p)" ""
+ifneq "$(findstring debug, $(way))" ""
 GhcRtsHcOpts=
 GhcRtsCcOpts=-g
 endif