summaryrefslogtreecommitdiff
path: root/ghc
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-05-30 11:33:05 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-06-04 14:42:04 -0400
commitc16f3297401f8f1f0f5d289867725ad185ac5a40 (patch)
tree8c1b246670c1ef4aa814b5588f0a931cf21a5857 /ghc
parent3ecc03df3b7777ecb40fbbbb2d6d7c2b98676d1c (diff)
downloadhaskell-c16f3297401f8f1f0f5d289867725ad185ac5a40.tar.gz
make: Fix bindist installation
This fixes a few vestigial references to `settings` left over from !655. Fixes #16715.
Diffstat (limited to 'ghc')
-rw-r--r--ghc/ghc.mk7
1 files changed, 2 insertions, 5 deletions
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