diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-03-11 14:53:17 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-03-11 15:14:38 +0100 |
| commit | 838d8044896b6544d8c80c2ab5de63d97220f06c (patch) | |
| tree | 23d9d61ec314845305bbdbd69b6281836626ced5 /rules/build-package-way.mk | |
| parent | 8cbd7f5d97cdc0f4cd6b8baaa999f990533dc801 (diff) | |
| download | haskell-838d8044896b6544d8c80c2ab5de63d97220f06c.tar.gz | |
Update Cabal submodule to latest 1.22 snapshot
This changes the library file name format
NOTE: This patch originally updated to Cabal HEAD, but was reduced to
update to Cabal 1.22 HEAD by hvr as this is needed in order to
update the filepath submodule to version 1.4.0, and subsequently
to be cherry-picked into the ghc-7.10 branch
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Reviewed By: austin
Differential Revision: https://phabricator.haskell.org/D707
Diffstat (limited to 'rules/build-package-way.mk')
| -rw-r--r-- | rules/build-package-way.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 3efe501451..27da099542 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -23,13 +23,13 @@ $(call hs-objs,$1,$2,$3) # The .a/.so library file, indexed by two different sets of vars: # the first is indexed by the dir, distdir and way # the second is indexed by the package id, distdir and way -$1_$2_$3_LIB_NAME = libHS$$($1_$2_PACKAGE_KEY)$$($3_libsuf) +$1_$2_$3_LIB_NAME = libHS$$($1_$2_LIB_NAME)$$($3_libsuf) $1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_NAME) $$($1_$2_PACKAGE_KEY)_$2_$3_LIB = $$($1_$2_$3_LIB) ifeq "$$(HostOS_CPP)" "mingw32" ifneq "$$($1_$2_dll0_HS_OBJS)" "" -$1_$2_$3_LIB0_ROOT = HS$$($1_$2_PACKAGE_KEY)-0$$($3_libsuf) +$1_$2_$3_LIB0_ROOT = HS$$($1_$2_LIB_NAME)-0$$($3_libsuf) $1_$2_$3_LIB0_NAME = lib$$($1_$2_$3_LIB0_ROOT) $1_$2_$3_LIB0 = $1/$2/build/$$($1_$2_$3_LIB0_NAME) endif @@ -136,7 +136,7 @@ ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" $1_$2_GHCI_LIB = $$($1_$2_dyn_LIB) else ifeq "$3" "v" -$1_$2_GHCI_LIB = $1/$2/build/HS$$($1_$2_PACKAGE_KEY).$$($3_osuf) +$1_$2_GHCI_LIB = $1/$2/build/HS$$($1_$2_LIB_NAME).$$($3_osuf) ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" # Don't put bootstrapping packages in the bindist ifneq "$4" "0" |