X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=eaefe4a56efa77339c5cd1f38b040bef6d96d956;hb=bc9c5514385a440ecb944a9f624f944005037083;hp=106d7aabfe2d5c2f542dd418a260e542b919dadd;hpb=a549d46404a69374ebe9d07a94006e8bd4f53ad5;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 106d7aa..eaefe4a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -350,7 +350,6 @@ endif
 #   thr_p       : threaded profiled
 #   debug       : debugging (compile with -g for the C compiler, and -DDEBUG)
 #   debug_p     : debugging profiled
-#   debug_u     : debugging unregisterised
 #   thr_debug   : debugging threaded
 #   thr_debug_p : debugging threaded profiled
 #   t		: ticky-ticky profiling
@@ -561,7 +560,7 @@ libdir0         := @libdir@
 includedir      := @includedir@
 mandir          := @mandir@
 
-ifeq "$(Windows)" "YES"
+ifeq "$(RelocatableBuild)" "YES"
 
 # Hack: our directory layouts tend to be different on Windows, so
 # hack around configure's bogus assumptions here.
@@ -1138,11 +1137,11 @@ HADDOCK			= @HaddockCmd@
 #
 # The ways currently defined.
 #
-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
+ALL_WAYS=p t s mp mg a b c d e f g h i j k l m n o A B
 USER_WAYS=a b c d e f g h 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 t mg,
 # as the driver script treats these guys specially and needs to carefully be told
 # about the options for these. Hence, we hide the required command line options
 # for these in the driver, as this is the only place they are needed.
@@ -1161,10 +1160,6 @@ WAY_p_HC_OPTS= -prof
 WAY_t_NAME=ticky-ticky profiling
 WAY_t_HC_OPTS= -ticky
 
-# Way `u':
-WAY_u_NAME=unregisterized (using portable C only)
-WAY_u_HC_OPTS=-unreg
-
 # Way `mp': 
 WAY_mp_NAME=parallel
 WAY_mp_HC_OPTS=-parallel
@@ -1193,10 +1188,6 @@ WAY_debug_HC_OPTS=-optc-DDEBUG
 WAY_debug_p_NAME=debug profiled
 WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 
-# Way 'debug_u':
-WAY_debug_u_NAME=debug unregisterised
-WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg
-
 # Way 'debug_t':
 WAY_debug_t_NAME=debug ticky-ticky profiling
 WAY_debug_t_HC_OPTS= -ticky -optc-DDEBUG