diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-20 16:23:58 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-22 10:32:27 -0700 |
| commit | 01f7e440ce221c01ba082003c372b5420e42797b (patch) | |
| tree | 4f440c45422081376f5b99f9867323d2494d4229 /rules/build-package-way.mk | |
| parent | 6c5a66a225fcd65eb3abe32cc2128b0b90440451 (diff) | |
| download | haskell-01f7e440ce221c01ba082003c372b5420e42797b.tar.gz | |
Rename $1_$2_$3_LIB_NAME to LIB_FILE.
Summary:
When we introduced user-friendly library names
(e.g. unix-2.7.1.0-G4Yo1pNtYrk8nCq1cx8P9d instead of
unix_G4Yo1pNtYrk8nCq1cx8P9d) we added a new variable to
be written out by ghc-cabal, $1_$2_LIB_NAME.
What I didn't realize at the time was that this conflicts
with an existing variable in the build system, $1_$2_$3_LIB_NAME,
which (confusingly) refers to something like
'libHSunix-2.7.1.0-G4Yo1pNtYrk8nCq1cx8P9d.so'. This is pretty
confusing (despite never conflicting), so I renamed this variable
to LIB_FILE for enhanced greppability.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: austin
Subscribers: thomie, bgamari
Differential Revision: https://phabricator.haskell.org/D1002
Diffstat (limited to 'rules/build-package-way.mk')
| -rw-r--r-- | rules/build-package-way.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 27da099542..cb8440d34c 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -23,8 +23,8 @@ $(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_LIB_NAME)$$($3_libsuf) -$1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_NAME) +$1_$2_$3_LIB_FILE = libHS$$($1_$2_LIB_NAME)$$($3_libsuf) +$1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_FILE) $$($1_$2_PACKAGE_KEY)_$2_$3_LIB = $$($1_$2_$3_LIB) ifeq "$$(HostOS_CPP)" "mingw32" |