diff options
| author | Zejun Wu <watashi@fb.com> | 2019-01-01 18:59:23 -0800 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-01-06 07:27:09 -0500 |
| commit | 3fb726d0696f4c59e58331e505e49f02f135a2f1 (patch) | |
| tree | a180efab38e0fcdfa55813f251242ce28489690c /ghc.mk | |
| parent | 3a509d2999d499793075b47d1fb7380c9e896ea1 (diff) | |
| download | haskell-3fb726d0696f4c59e58331e505e49f02f135a2f1.tar.gz | |
Fix bindist for ghci library
Summary:
https://phabricator.haskell.org/D5169 built libghci for both vanilla way
and profiling way. We need to include both in the bindist list so they
will be installed.
Test Plan:
```
$ grep '^BuildFlavour' mk/build.mk
BuildFlavour=perf
$ make test_bindist
$ grep HSghc-prim bindist-list.uniq
ghc-8.7.20190101/libraries/ghc-prim/dist-install/build/HSghc-prim-0.5.3.o
ghc-8.7.20190101/libraries/ghc-prim/dist-install/build/HSghc-prim-0.5.3.p_o
ghc-8.7.20190101/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3.a
ghc-8.7.20190101/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3-ghc8.7.20190101.so
ghc-8.7.20190101/libraries/ghc-prim/dist-install/build/libHSghc-prim-0.5.3_p.a
```
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -784,8 +784,11 @@ ifneq "$(BINDIST)" "YES" # Make sure we have all the GHCi libs by the time we've built # ghc-stage2. # -GHCI_LIBS = $(foreach lib,$(PACKAGES_STAGE1),$(libraries/$(lib)_dist-install_GHCI_LIB)) \ - $(compiler_stage2_GHCI_LIB) +GHCI_LIBS = \ + $(foreach way,$(GhcLibWays),\ + $(foreach lib,$(PACKAGES_STAGE1),\ + $(libraries/$(lib)_dist-install_$(way)_GHCI_LIB)) \ + $(compiler_stage2_$(way)_GHCI_LIB)) ifeq "$(UseArchivesForGhci)" "NO" ghc/stage2/build/tmp/$(ghc_stage2_PROG) : $(GHCI_LIBS) |