From 01f7e440ce221c01ba082003c372b5420e42797b Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Sat, 20 Jun 2015 16:23:58 -0700 Subject: 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 Test Plan: validate Reviewers: austin Subscribers: thomie, bgamari Differential Revision: https://phabricator.haskell.org/D1002 --- rules/build-package-way.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rules') 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" -- cgit v1.2.1