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 /rules | |
| 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 'rules')
| -rw-r--r-- | rules/build-package-way.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 0a762d385a..f9eca23cce 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -113,14 +113,14 @@ endif # Build the GHCi library ifneq "$(filter $3, v p)" "" -$1_$2_GHCI_LIB = $1/$2/build/HS$$($1_$2_COMPONENT_ID).$$($3_osuf) +$1_$2_$3_GHCI_LIB = $1/$2/build/HS$$($1_$2_COMPONENT_ID).$$($3_osuf) ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" # Don't put bootstrapping packages in the bindist ifneq "$4" "0" -BINDIST_LIBS += $$($1_$2_GHCI_LIB) +BINDIST_LIBS += $$($1_$2_$3_GHCI_LIB) endif endif -$$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) $$($1_$2_LD_SCRIPT) +$$($1_$2_$3_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) $$($1_$2_LD_SCRIPT) $$(call cmd,LD_NO_GOLD) $$(CONF_LD_LINKER_OPTS_STAGE$4) -r $$(if $$($1_$2_LD_SCRIPT),$$($1_$2_LD_SCRIPT_CMD) $$($1_$2_LD_SCRIPT)) -o $$@ $$(EXTRA_LD_LINKER_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) # NB. LD_NO_GOLD above: see #14328 (symptoms: #14675,#14291). At least # some versions of ld.gold appear to have a bug that causes the @@ -129,7 +129,7 @@ $$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OB ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" # Don't bother making ghci libs for bootstrapping packages ifneq "$4" "0" -$(call all-target,$1_$2,$$($1_$2_GHCI_LIB)) +$(call all-target,$1_$2,$$($1_$2_$3_GHCI_LIB)) endif endif # "$$($1_$2_BUILD_GHCI_LIB)" "YES" endif # "$(filter $3, v p)" "" |