summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gentoo.org>2007-07-27 09:09:20 +0000
committerLennart Kolmodin <kolmodin@gentoo.org>2007-07-27 09:09:20 +0000
commit036e41b6d5d96fe30d50491c9cf5d0ce8d38811b (patch)
treee37d38b38ae63e52dec1bc8dec02cd4ae7e7ea2b /eclass
parentAdd 2.18.2 mostly reflecting package versions as was for upstream 2.18.2; rem... (diff)
downloadhistorical-036e41b6d5d96fe30d50491c9cf5d0ce8d38811b.tar.gz
historical-036e41b6d5d96fe30d50491c9cf5d0ce8d38811b.tar.bz2
historical-036e41b6d5d96fe30d50491c9cf5d0ce8d38811b.zip
Cabal profiling should not affect executables. Fix which/type -P.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/haskell-cabal.eclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 7909461f1210..ad6882dfb1b9 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.11 2007/07/25 18:07:02 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/haskell-cabal.eclass,v 1.12 2007/07/27 09:09:20 kolmodin Exp $
#
# Original authors: Andres Loeh <kosmikus@gentoo.org>
# Duncan Coutts <dcoutts@gentoo.org>
@@ -127,7 +127,6 @@ cabal-haddock() {
cabal-configure() {
if [[ -n "${CABAL_USE_PROFILE}" ]] && use profile; then
- cabalconf="${cabalconf} --enable-executable-profiling";
cabalconf="${cabalconf} --enable-library-profiling"
fi
# Building GHCi libs on ppc64 causes "TOC overflow".
@@ -186,7 +185,7 @@ cabal-pkg() {
local err
if [[ -n ${CABAL_HAS_LIBRARIES} ]]; then
- sed -i "s|$(ghc-getghcpkg)|$(which true)|" .setup-config
+ sed -i "s|$(ghc-getghcpkg)|$(type -P true)|" .setup-config
./setup register || die "setup register failed"
if [[ -f .installed-pkg-config ]]; then
ghc-setup-pkg .installed-pkg-config