[Git][ghc/ghc][master] hadrian: Add dependency from lib/settings to mk/config.mk

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
79ffa170 by Ben Gamari at 2023-03-01T04:17:20-05:00
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.

- - - - -


1 changed file:

- hadrian/bindist/Makefile


Changes:

=====================================
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)")' >> $@



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/79ffa170a6b0b152da0e02744869311773733286

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/79ffa170a6b0b152da0e02744869311773733286
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230301/dc08bdff/attachment.html>