diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2023-02-14 12:02:25 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2023-03-01 04:17:20 -0500 |
| commit | 79ffa170a6b0b152da0e02744869311773733286 (patch) | |
| tree | e73acd080d3a3deca017a6b1cf4b06c33a01ae33 | |
| parent | bb500e2a2d039dc75c8bb80d47ea2349b97fbf1b (diff) | |
| download | haskell-79ffa170a6b0b152da0e02744869311773733286.tar.gz | |
hadrian: Add dependency from lib/settings to mk/config.mk
In 81975ef375de07a0ea5a69596b2077d7f5959182 we attempted to fix #20253
by adding logic to the bindist Makefile to regenerate the `settings`
file from information gleaned by the bindist `configure` script.
However, this fix had no effect as `lib/settings` is shipped in the
binary distribution (to allow in-place use of the binary distribution).
As `lib/settings` already existed and its rule declared no dependencies,
`make` would fail to use the added rule to regenerate it.
Fix this by explicitly declaring a dependency from `lib/settings` on
`mk/config.mk`.
Fixes #22982.
| -rw-r--r-- | hadrian/bindist/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index 2b0903796e..f36ffa57c0 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -77,7 +77,7 @@ endif WrapperBinsDir=${bindir} # N.B. this is duplicated from includes/ghc.mk. -lib/settings : +lib/settings : config.mk $(call removeFiles,$@) @echo '[("GCC extra via C opts", "$(GccExtraViaCOpts)")' >> $@ @echo ',("C compiler command", "$(SettingsCCompilerCommand)")' >> $@ |