X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FMakefile;h=e9612a9e7131e4cfd038cac79e286e4e635787f8;hb=aee2068e034aca6ddaf6f20f85902137ecf718b7;hp=08240a12123c7eb5c0c7d666a1824d64f9a020d8;hpb=14591e0d3d238a40d034fb9ddd0ae90688e007eb;p=ghc-hetmet.git

diff --git a/rts/Makefile b/rts/Makefile
index 08240a1..e9612a9 100644
--- a/rts/Makefile
+++ b/rts/Makefile
@@ -96,7 +96,7 @@ WARNING_OPTS += -Wmissing-declarations
 WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
 #WARNING_OPTS += -Wpointer-arith
-WARNING_OPTS += -Wbad-function-cast
+#WARNING_OPTS += -Wbad-function-cast
 #WARNING_OPTS += -Wcast-align
 #WARNING_OPTS += -Wnested-externs
 #WARNING_OPTS += -Wshadow
@@ -144,6 +144,10 @@ ifeq "$(HaveLibMingwEx)" "YES"
 PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
 endif
 
+ifeq "$(GhciWithDebugger)" "YES"
+STANDARD_OPTS += -DDEBUGGER
+endif
+
 ifeq "$(DotnetSupport)" "YES"
 
 # 
@@ -181,8 +185,8 @@ endif
 #-----------------------------------------------------------------------------
 # Add PAPI library if needed
 
-ifeq "$(USE_PAPI)" "YES"
-SRC_HC_OPTS		+= -lpapi -optc-DUSE_PAPI
+ifeq "$(GhcRtsWithPapi)" "YES"
+SRC_HC_OPTS		+= -optc-DUSE_PAPI
 PACKAGE_CPP_OPTS	+= -DUSE_PAPI
 endif