diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-05-30 11:33:05 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-06-03 14:19:58 -0400 |
| commit | 713fd7565e156dc84cb2d33e249e409eea2b158a (patch) | |
| tree | 556e744d24293039ec8495b5902cdcf0098cacd9 | |
| parent | a007121e168e0de890872f446b8d70d836db936a (diff) | |
| download | haskell-713fd7565e156dc84cb2d33e249e409eea2b158a.tar.gz | |
make: Fix bindist installationwip/run-bindisttest
This fixes a few vestigial references to `settings` left over from !655.
Fixes #16715.
| -rw-r--r-- | ghc.mk | 4 | ||||
| -rw-r--r-- | ghc/ghc.mk | 7 |
2 files changed, 5 insertions, 6 deletions
@@ -1021,6 +1021,8 @@ $(eval $(call bindist-list,.,\ $(BINDIST_LIBS) \ $(BINDIST_HI) \ $(BINDIST_EXTRAS) \ + includes/Makefile \ + $(includes_SETTINGS) \ $(includes_H_FILES) \ $(includes_DERIVEDCONSTANTS) \ $(includes_GHCCONSTANTS) \ @@ -1037,7 +1039,7 @@ $(eval $(call bindist-list,.,\ $(wildcard compiler/stage2/doc) \ $(wildcard libraries/*/dist-install/doc/) \ $(wildcard libraries/*/*/dist-install/doc/) \ - $(filter-out settings llvm-targets llvm-passes,$(INSTALL_LIBS)) \ + $(filter-out llvm-targets llvm-passes,$(INSTALL_LIBS)) \ $(RTS_INSTALL_LIBS) \ $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \ mk/project.mk \ diff --git a/ghc/ghc.mk b/ghc/ghc.mk index 9747e34dcc..b1f9f57d81 100644 --- a/ghc/ghc.mk +++ b/ghc/ghc.mk @@ -129,10 +129,7 @@ all_ghc_stage1 : $(GHC_STAGE1) all_ghc_stage2 : $(GHC_STAGE2) all_ghc_stage3 : $(GHC_STAGE3) -settings : $(includes_SETTINGS) - "$(CP)" $< $@ - -$(INPLACE_LIB)/settings : settings +$(INPLACE_LIB)/settings : $(includes_SETTINGS) "$(CP)" $< $@ $(INPLACE_LIB)/llvm-targets : llvm-targets @@ -171,7 +168,7 @@ $(GHC_STAGE2) : $(foreach w,$(GhcLibWays),libraries/base/dist-install/build/GHC/ endif -INSTALL_LIBS += settings +INSTALL_LIBS += $(includes_SETTINGS) INSTALL_LIBS += llvm-targets INSTALL_LIBS += llvm-passes |