X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=65207c7dbcdaad86e4c45f70a10ad667b803cdfc;hb=78260da4deee97a866ba83f8d73a8284b371f405;hp=275de627be431c43754ba195598adef5048e8e57;hpb=19f903bc5210e0cccfafbebdc46ed6e1743991ba;p=ghc-hetmet.git diff --git a/compiler/Makefile b/compiler/Makefile index 275de62..65207c7 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -78,14 +78,9 @@ clean.stage.%: CONFIGURE_FLAGS_STAGE1 += --flags=stage1 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1 -CONFIGURE_FLAGS_STAGE1 += --flags=-ghci - ifeq "$(GhcWithNativeCodeGen)" "YES" CONFIGURE_FLAGS_STAGE1 += --flags=ncg CONFIGURE_FLAGS_STAGE2 += --flags=ncg -else -CONFIGURE_FLAGS_STAGE1 += --flags=-ncg -CONFIGURE_FLAGS_STAGE2 += --flags=-ncg endif ifeq "$(GhcWithInterpreter)" "YES" @@ -99,8 +94,6 @@ CONFIGURE_FLAGS_STAGE2 += --enable-shared # function which sets the keepCAFs flag for the RTS before any Haskell # code is run. CONFIGURE_FLAGS_STAGE2 += --flags=dynlibs -else -CONFIGURE_FLAGS_STAGE2 += --flags=-dynlibs endif ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" @@ -127,9 +120,6 @@ ifeq "$(wildcard $(FPTOOLS_TOP_ABS)/libraries/editline/unbuildable)" "" CONFIGURE_FLAGS_STAGE2 += --flags=editline endif endif - -else -CONFIGURE_FLAGS_STAGE2 += --flags=-ghci endif ifeq "$(GhcWithNativeCodeGen)" "NO"