X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghc.mk;h=df07430596a37f395960d8fa0ddd528361f3f5b2;hb=2247d4c49e705ee88f5249368e718c12897fe103;hp=60a65d44e7de6a86a428acfd9e4d25103a8764a3;hpb=9142c238bd014c45e30fc79eee69fa6ab3f469d8;p=ghc-hetmet.git diff --git a/compiler/ghc.mk b/compiler/ghc.mk index 60a65d4..df07430 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -371,28 +371,6 @@ compiler_stage2_CONFIGURE_OPTS += --ghc-option=-auto-all compiler_stage2_CONFIGURE_OPTS += --ghc-pkg-option=--force endif -ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32" -# The #include is vital for the via-C route with older compilers, else the C -# compiler doesn't realise that the stcall foreign imports are indeed -# stdcall, and doesn't generate the Foo@8 name for them -# It's only important for older compilers, and in fact newer compilers -# will give a warning if the -#include flag is used. We therefore only -# do it for stage1, and only for < 6.11. -ifeq "$(ghc_ge_611)" "NO" -compiler_stage1_CONFIGURE_OPTS += --ghc-option='-\#include' \ - --ghc-option='""' \ - --ghc-option='-\#include' \ - --ghc-option='""' -endif -endif - -# ghc_strlen percolates through so many modules that it is easier to get its -# prototype via a global option instead of a myriad of per-file OPTIONS. -# Again, this is only done for older compilers. -ifeq "$(ghc_ge_611)" "NO" -compiler_stage1_CONFIGURE_OPTS += --ghc-options='-\#include "cutils.h"' -endif - compiler_stage3_CONFIGURE_OPTS := $(compiler_stage2_CONFIGURE_OPTS) compiler_stage1_CONFIGURE_OPTS += --ghc-option=-DSTAGE=1