Build system: make clean in utils/ghc-pkg should not delete inplace/lib/bin
authorThomas Miedema <thomasmiedema@gmail.com>
Thu, 28 May 2015 09:57:07 +0000 (11:57 +0200)
committerThomas Miedema <thomasmiedema@gmail.com>
Sat, 30 May 2015 15:03:00 +0000 (17:03 +0200)
Make sure $1_$2_PROG always gets assigned a value, even when cleaning.

The problem with not setting the variable becomes apparent when looking
at the following two lines of code:

```
  $1_$2_INPLACE = $$(INPLACE_LIB)/bin/$$($1_$2_PROG)
  $(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE))
```

So running `make clean` in for example `utils/ghc-pkg` deletes
`inplace/lib/bin/` instead of `inplace/lib/bin/ghc-pkg`.

The offending code was introduced in commit
2b85372ca18115bb1d6363256fcea6f54e415bed.

There is one small implication. When cleaning before configure, the
variable $1_$2_PROG will now be assigned a slightly wrong value, because
exeext$3 isn't known yet. But I think that's ok, as no files have been
build yet, so it will just try to delete a slighly different nonexistent
file.

[skip ci]

Differential Revision: https://phabricator.haskell.org/D916

rules/build-prog.mk

index b32a7a0..10d31c5 100644 (file)
@@ -29,8 +29,8 @@ endif
 ifneq "$$($1_$2_PROG)" ""
 $$(error $1_$2_PROG is set)
 endif
-$1_$2_PROG = $$($1_$2_PROGNAME)$$(exeext$3)
 endif
+$1_$2_PROG = $$($1_$2_PROGNAME)$$(exeext$3)
 
 ifeq "$$(findstring $3,0 1 2)" ""
 $$(error $1/$2: stage argument to build-prog should be 0, 1, or 2)