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

diff --git a/rts/Makefile b/rts/Makefile
index 08240a1..6bf4271 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
 
@@ -288,6 +292,24 @@ endif
 
 CLEAN_FILES += gmp/libgmp.a
 
+# Need to get the GMP vars in through CPP to package.conf.in, and put
+# quotes around each element.
+
+empty =
+space = $(empty) $(empty)
+comma = ,
+PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))'
+PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))'
+
+ifneq "$(GMP_INCLUDE_DIRS)" ""
+SRC_HC_OPTS += -I$(GMP_INCLUDE_DIRS)
+SRC_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
+SRC_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS)
+endif
+ifneq "$(GMP_LIB_DIRS)" ""
+SRC_LD_OPTS += -L$(GMP_LIB_DIRS)
+endif
+
 #-----------------------------------------------------------------------------
 #
 # Building the GUM SysMan