[commit: ghc] master: Remove makefile logic for legacy -this-package-key (400ead8)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/400ead81e80f66ad7b1260b11b2a92f25ccc3e5a/ghc

>---------------------------------------------------------------

commit 400ead81e80f66ad7b1260b11b2a92f25ccc3e5a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Sep 9 14:25:30 2017 +0200

    Remove makefile logic for legacy -this-package-key
    
    This isn't needed anymore as we don't support GHC < 8 anymore.
    
    This is a follow-up to 122f183


>---------------------------------------------------------------

400ead81e80f66ad7b1260b11b2a92f25ccc3e5a
 configure.ac              |  5 -----
 mk/config.mk.in           |  2 --
 rules/distdir-way-opts.mk | 10 ----------
 3 files changed, 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 92b8523..8d1a71a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,11 +176,6 @@ fi
 GHC_PACKAGE_DB_FLAG=package-db
 AC_SUBST(GHC_PACKAGE_DB_FLAG)
 
-FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.11],
-                    SUPPORTS_THIS_UNIT_ID=NO,
-                    SUPPORTS_THIS_UNIT_ID=YES)
-AC_SUBST(SUPPORTS_THIS_UNIT_ID)
-
 # GHC is passed to Cabal, so we need a native path
 if test "${WithGhc}" != ""
 then
diff --git a/mk/config.mk.in b/mk/config.mk.in
index dbcd0e4..ac1512e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -510,8 +510,6 @@ endif
 
 GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
 
-SUPPORTS_THIS_UNIT_ID = @SUPPORTS_THIS_UNIT_ID@
-
 #-----------------------------------------------------------------------------
 # C compiler
 #
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 88847e8..45dc0ce 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -105,20 +105,10 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
 # $1_$2_$3_MOST_HC_OPTS is also passed to C compilations when we use
 # GHC as the C compiler.
 
-ifeq "$(SUPPORTS_THIS_UNIT_ID)" "NO"
-ifeq "$4" "0"
-$4_USE_THIS_UNIT_ID=NO
-endif
-endif
-
 $1_$2_$4_DEP_OPTS = \
  $$(foreach pkg,$$($1_$2_DEP_IPIDS),-package-id $$(pkg))
 
-ifeq "$($4_USE_THIS_UNIT_ID)" "NO"
-$4_THIS_UNIT_ID = -this-package-key
-else
 $4_THIS_UNIT_ID = -this-unit-id
-endif
 
 $1_$2_$3_MOST_HC_OPTS = \
  $$(WAY_$3_HC_OPTS) \