summaryrefslogtreecommitdiff
path: root/compiler/ghc.mk
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2015-10-11 13:41:20 -0700
committerEdward Z. Yang <ezyang@cs.stanford.edu>2015-10-14 21:40:58 -0700
commit6338a1cc6df2c7fd8a62eeb4c5240dd90ee74a6c (patch)
treec2a14d6f908cf76e4d3b71342dc36d781bc2e40d /compiler/ghc.mk
parentb92a51f5e235fc22a9ae0d76735b50f095665fb7 (diff)
downloadhaskell-6338a1cc6df2c7fd8a62eeb4c5240dd90ee74a6c.tar.gz
Rename PACKAGE_KEY and LIB_NAME in build system.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Diffstat (limited to 'compiler/ghc.mk')
-rw-r--r--compiler/ghc.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 8172ca6516..fc9e89184a 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -441,11 +441,11 @@ ifeq "$(compiler_stage1_VERSION_MUNGED)" "YES"
compiler_stage1_MUNGED_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion))
define compiler_PACKAGE_MAGIC
compiler_stage1_VERSION = $(compiler_stage1_MUNGED_VERSION)
-compiler_stage1_PACKAGE_KEY = $(subst .$(ProjectPatchLevel),,$(compiler_stage1_PACKAGE_KEY))
-compiler_stage1_LIB_NAME = $(subst .$(ProjectPatchLevel),,$(compiler_stage1_LIB_NAME))
+compiler_stage1_COMPONENT_ID = $(subst .$(ProjectPatchLevel),,$(compiler_stage1_COMPONENT_ID))
+compiler_stage1_COMPONENT_ID = $(subst .$(ProjectPatchLevel),,$(compiler_stage1_COMPONENT_ID))
endef
-# NB: the PACKAGE_KEY munging has no effect for new-style unit ids
+# NB: the COMPONENT_ID munging has no effect for new-style unit ids
# (which indeed, have nothing version like in them, but are important for
# old-style unit ids which do.) The subst operation is idempotent, so
# as long as we do it at least once we should be good.