diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2016-07-26 18:02:55 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2016-07-26 18:05:45 +0900 |
| commit | 59e9c21f42c59afdf0af2985be1528129525ed57 (patch) | |
| tree | eebf79822cefc4cb7641b74e90bf2f86466a535a | |
| parent | dev-util/gprof2dot: Prefix support. (diff) | |
| download | gentoo-59e9c21f42c59afdf0af2985be1528129525ed57.tar.gz gentoo-59e9c21f42c59afdf0af2985be1528129525ed57.tar.bz2 gentoo-59e9c21f42c59afdf0af2985be1528129525ed57.zip | |
ghc-package.eclass, haskell-cabal.eclass: remove ghc-host-root.
Bug: 534194
| -rw-r--r-- | eclass/ghc-package.eclass | 12 | ||||
| -rw-r--r-- | eclass/haskell-cabal.eclass | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/eclass/ghc-package.eclass b/eclass/ghc-package.eclass index ccc6d6ffd84b..5466c0b5b20d 100644 --- a/eclass/ghc-package.eclass +++ b/eclass/ghc-package.eclass @@ -62,16 +62,6 @@ ghc-getghcpkgbin() { fi } -# @FUNCTION: ghc-host-prefix -# @DESCRIPTION: -# Returns root of installed ghc. -# Some helpers (like best_version) require reference -# host system as they are tied to compiler bing executed. -ghc-host-root() { - has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX= - echo "${EPREFIX}/" -} - # @FUNCTION: ghc-version # @DESCRIPTION: # returns upstream version of ghc @@ -95,7 +85,7 @@ ghc-pm-version() { local pm_ghc_p if [[ -z "${_GHC_PM_VERSION_CACHE}" ]]; then - pm_ghc_p=$(ROOT=$(ghc-host-root) best_version dev-lang/ghc) + pm_ghc_p=$(best_version dev-lang/ghc) _GHC_PM_VERSION_CACHE="PM:${pm_ghc_p#dev-lang/ghc-}" fi echo "${_GHC_PM_VERSION_CACHE}" diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index 7732711ea90a..c1a13300abb0 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -177,7 +177,7 @@ cabal-version() { else # We ask portage, not ghc, so that we only pick up # portage-installed cabal versions. - _CABAL_VERSION_CACHE="$(ROOT=$(ghc-host-root) ghc-extractportageversion dev-haskell/cabal)" + _CABAL_VERSION_CACHE="$(ghc-extractportageversion dev-haskell/cabal)" fi fi echo "${_CABAL_VERSION_CACHE}" |