diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-31 21:25:26 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2015-12-31 22:41:26 +0100 |
| commit | 12ee51137a8c848f64b44fd8f3f4cd899bb214bc (patch) | |
| tree | fa5077088156d77a1ea1ad5764025341c0042b91 /rules/distdir-way-opts.mk | |
| parent | 3c8cb7f43c89e9a2b754adc5e639985f0b95b1f1 (diff) | |
| download | haskell-12ee51137a8c848f64b44fd8f3f4cd899bb214bc.tar.gz | |
Remove ghc-7.8 `-package-name`-compat handling
This code was introduced in 66218d15b7c27a4a38992003bd761f60bae84b1f to
use `-package-name` for GHC 7.8, whereas GHC 7.10 needs the new
`-this-package-key` flag.
Diffstat (limited to 'rules/distdir-way-opts.mk')
| -rw-r--r-- | rules/distdir-way-opts.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 92dbf346ff..f6b9a45b8f 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -96,21 +96,9 @@ 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_COMPONENT_ID)" "NO" -ifeq "$4" "0" -$4_USE_COMPONENT_ID=NO -endif -endif - $1_$2_$4_DEP_OPTS = \ $$(foreach pkg,$$($1_$2_DEP_IPIDS),-package-id $$(pkg)) -ifeq "$($4_USE_COMPONENT_ID)" "NO" -$4_THIS_COMPONENT_ID = -package-name -else -$4_THIS_COMPONENT_ID = -this-package-key -endif - $1_$2_$3_MOST_HC_OPTS = \ $$(WAY_$3_HC_OPTS) \ $$(CONF_HC_OPTS) \ @@ -119,7 +107,7 @@ $1_$2_$3_MOST_HC_OPTS = \ $$($1_HC_OPTS) \ $$($1_$2_HC_PKGCONF) \ $$(if $$($1_$2_PROG),, \ - $$(if $$($1_PACKAGE),$$($4_THIS_COMPONENT_ID) $$($1_$2_COMPONENT_ID))) \ + $$(if $$($1_PACKAGE),-this-package-key $$($1_$2_COMPONENT_ID))) \ $$(if $$($1_PACKAGE),-hide-all-packages) \ -i $$(if $$($1_$2_HS_SRC_DIRS),$$(foreach dir,$$($1_$2_HS_SRC_DIRS),-i$1/$$(dir)),-i$1) \ -i$1/$2/build -i$1/$2/build/autogen \ |