diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-09 14:25:30 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2017-09-09 14:27:22 +0200 |
| commit | 400ead81e80f66ad7b1260b11b2a92f25ccc3e5a (patch) | |
| tree | 58ef2a49a1ae1a561dd8494a1188b7fc824d1433 | |
| parent | 122f183d47fe46a54d2964111ce269939706b0f8 (diff) | |
| download | haskell-400ead81e80f66ad7b1260b11b2a92f25ccc3e5a.tar.gz | |
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
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 | ||||
| -rw-r--r-- | rules/distdir-way-opts.mk | 10 |
3 files changed, 0 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 92b8523023..8d1a71a104 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 dbcd0e45b8..ac1512e7b7 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 88847e86b7..45dc0ce988 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) \ |