[commit: packages/Cabal] ghc-head: Add arguments EXTRA_BUILD_OPTS and EXTRA_INSTALL_OPTS. (24f50cf)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=24f50cf67126fa74cda66c8ba09920e2b07db0ba

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

commit 24f50cf67126fa74cda66c8ba09920e2b07db0ba
Author: Masahiro Yamauchi <sgt.yamauchi at gmail.com>
Date:   Mon Jul 1 10:43:06 2013 +0900

    Add arguments EXTRA_BUILD_OPTS and EXTRA_INSTALL_OPTS.
    
    Also add SCOPE_OF_INSTALLATION to 'setup install'.


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

24f50cf67126fa74cda66c8ba09920e2b07db0ba
 cabal-install/bootstrap.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cabal-install/bootstrap.sh b/cabal-install/bootstrap.sh
index f8214c1..4ccabcc 100755
--- a/cabal-install/bootstrap.sh
+++ b/cabal-install/bootstrap.sh
@@ -9,6 +9,8 @@
 # install settings, you can override these by setting environment vars
 #VERBOSE
 #EXTRA_CONFIGURE_OPTS
+#EXTRA_BUILD_OPTS
+#EXTRA_INSTALL_OPTS
 
 # programs, you can override these by setting environment vars
 GHC=${GHC:-ghc}
@@ -162,10 +164,10 @@ install_pkg () {
     ${EXTRA_CONFIGURE_OPTS} ${VERBOSE} \
     || die "Configuring the ${PKG} package failed"
 
-  ./Setup build ${VERBOSE} \
+  ./Setup build ${EXTRA_BUILD_OPTS} ${VERBOSE} \
     || die "Building the ${PKG} package failed"
 
-  ./Setup install ${VERBOSE} \
+  ./Setup install ${SCOPE_OF_INSTALLATION} ${EXTRA_INSTALL_OPTS} ${VERBOSE} \
     || die "Installing the ${PKG} package failed"
 }