diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-09-18 13:44:43 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-09-18 13:44:43 +0000 |
| commit | 894775f034d278ff5493eeaf8587914626e8df21 (patch) | |
| tree | f4d0864d3676e0199945fd8a369e59eec95fa9fe | |
| parent | 51d7126ec1ac139e583af6375cde09acb8ddfed4 (diff) | |
| download | haskell-894775f034d278ff5493eeaf8587914626e8df21.tar.gz | |
Be more forceful when cleaning in compiler/ and ghc/
Now that the Cabal file is generated by configure, it would be nice
if clean worked even if the cabal file is missing. So now we just rm -rf
the dist directory.
| -rw-r--r-- | compiler/Makefile | 6 | ||||
| -rw-r--r-- | ghc/Makefile | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/compiler/Makefile b/compiler/Makefile index 592498f5fa..69b290340c 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -77,8 +77,12 @@ distclean:: endif clean.stage.%: - -$(CABAL) clean --distpref dist-stage$* $(RM) -f Makefile-stage$* +# This is a bit naughty. We ought to use: +# -$(CABAL) clean --distpref dist-stage$* +# but that won't work if the Cabal file (a generated file) doesn't +# exist. So we do this instead: + $(RM) -rf dist-stage$* CONFIGURE_FLAGS_STAGE1 += --flags=stage1 CONFIGURE_FLAGS_STAGE2 += --flags=-stage1 diff --git a/ghc/Makefile b/ghc/Makefile index c0664df5fd..23a5384d58 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -47,8 +47,12 @@ distclean:: endif clean.stage.%: - -$(CABAL) clean --distpref dist-stage$* $(RM) -rf stage$*-inplace +# This is a bit naughty. We ought to use: +# -$(CABAL) clean --distpref dist-stage$* +# but that won't work if the Cabal file (a generated file) doesn't +# exist. So we do this instead: + $(RM) -rf dist-stage$* CONFIGURE_FLAGS_STAGE1 += --flags=-ghci |