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 --- rts/ghc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rts') diff --git a/rts/ghc.mk b/rts/ghc.mk index 787f67a12d..7fa36b6f17 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -153,8 +153,8 @@ $(call distdir-way-opts,rts,dist,$1) $(call c-suffix-rules,rts,dist,$1,YES) $(call cmm-suffix-rules,rts,dist,$1) -rts_$1_LIB_NAME = libHSrts$$($1_libsuf) -rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_NAME) +rts_$1_LIB_FILE = libHSrts$$($1_libsuf) +rts_$1_LIB = rts/dist/build/$$(rts_$1_LIB_FILE) rts_$1_C_OBJS = $$(patsubst rts/%.c,rts/dist/build/%.$$($1_osuf),$$(rts_C_SRCS)) $$(patsubst %.c,%.$$($1_osuf),$$(rts_$1_EXTRA_C_SRCS)) rts_$1_S_OBJS = $$(patsubst rts/%.S,rts/dist/build/%.$$($1_osuf),$$(rts_S_SRCS)) -- cgit v1.2.1