[project @ 2003-09-21 22:20:51 by wolfgang]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index b210309..6a75b87 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -110,11 +110,17 @@ ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
-# Currently, you only get 'threads support' in the normal
-# way.
+# You get 'threads support' in the normal
+# and profiling ways.
 ifeq "$(GhcRtsThreaded)" "YES"
 ifeq "$(way)" ""
 SRC_CC_OPTS += -DTHREADED_RTS
+SRC_HC_OPTS += -optc-DTHREADED_RTS
+PACKAGE_CPP_OPTS += -DTHREADED_RTS
+endif
+ifeq "$(way)" "p"
+SRC_CC_OPTS += -DTHREADED_RTS
+SRC_HC_OPTS += -optc-DTHREADED_RTS
 PACKAGE_CPP_OPTS += -DTHREADED_RTS
 endif
 endif
@@ -213,16 +219,9 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkHaskellSupport)" "YES"
-ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 boot ::
-       cd gmp && ./configure --enable-shared=no \
+       cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no \
                --host=`echo $(HOSTPLATFORM) | sed 's/i[567]86/i486/g'`
-else
-# Pass --target to configure of GMP, so that building for mingwin under
-# cygwin works properly (when the host is not the same as the target)
-boot ::
-       cd gmp && CC=$(WhatGccIsCalled) ./configure --enable-shared=no --target=$(HOSTPLATFORM)
-endif
 
 # Slight cheatage here to pass host as target, but x-compilation isn't supported by ghc.