X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fcabal-flags.mk;h=4144f255d231c3ffdb42f8f8075aed0298e3ff1c;hb=4a73af53332e94ca56a6faed96f8391c14ecfa18;hp=4e61c662d81de65938f341879e2c743e1f7ce8b8;hpb=09d76f81a7b77139901a73f9f241d26a5bdd3796;p=ghc-hetmet.git

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index 4e61c66..4144f25 100644
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -15,9 +15,10 @@ FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
                                  $(space)--configure-option=',\
                                  $(space)$(CONFIGURE_ARGS))
 
-COMMON_CONFIGURE_FLAGS = \
-    --libsubdir='$$pkgid' \
-    --with-ld=$(LD) \
+COMMON_CONFIGURE_FLAGS =          \
+    --libsubdir='$$pkgid'         \
+    --with-gcc=$(WhatGccIsCalled) \
+    --with-ld=$(LD)               \
     $(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
 
 ifneq "$(HSCOLOUR)" ""
@@ -28,10 +29,6 @@ ifneq "$(ALEX)" ""
 COMMON_CONFIGURE_FLAGS += --with-alex=$(ALEX)
 endif
 
-ifneq "$(HADDOCK)" ""
-COMMON_CONFIGURE_FLAGS += --with-haddock=$(HADDOCK)
-endif
-
 ifneq "$(HAPPY)" ""
 COMMON_CONFIGURE_FLAGS += --with-happy=$(HAPPY)
 endif