From 6e232f498ba600e7d7cc4938f5f2e6ce5d300bbc Mon Sep 17 00:00:00 2001
From: Ian Lynagh <igloo@earth.li>
Date: Sun, 8 Nov 2009 12:02:04 +0000
Subject: [PATCH] Tell ghc-cabal what strip program to use

---
 ghc.mk                       |    1 +
 utils/ghc-cabal/ghc-cabal.hs |   20 ++++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index e64202f..23d4e5f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -866,6 +866,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 	    "$(GHC_CABAL_INPLACE)" install \
 		 "$(INSTALLED_GHC_REAL)" \
 		 "$(INSTALLED_GHC_PKG_REAL)" \
+		 "$(STRIP)" \
 		 "$(DESTDIR)$(topdir)" \
 		 $p $(INSTALL_DISTDIR_$p) \
 		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs
index 9a99ad4..ef4e989 100644
--- a/utils/ghc-cabal/ghc-cabal.hs
+++ b/utils/ghc-cabal/ghc-cabal.hs
@@ -34,10 +34,10 @@ main = do args <- getArgs
                   runHaddock distDir dir args'
               "check" : dir : [] ->
                   doCheck dir
-              "install" : ghc : ghcpkg : topdir : directory : distDir
+              "install" : ghc : ghcpkg : strip : topdir : directory : distDir
                         : myDestDir : myPrefix : myLibdir : myDocdir
                         : relocatableBuild : args' ->
-                  doInstall ghc ghcpkg topdir directory distDir
+                  doInstall ghc ghcpkg strip topdir directory distDir
                             myDestDir myPrefix myLibdir myDocdir
                             relocatableBuild args'
               "configure" : args' -> case break (== "--") args' of
@@ -139,10 +139,10 @@ runHaddock distdir directory args
           = f pd lbi us flags
 
 doInstall :: FilePath -> FilePath -> FilePath -> FilePath -> FilePath
-          -> FilePath -> FilePath -> FilePath -> FilePath -> String
-          -> [String]
+          -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
+          -> String -> [String]
           -> IO ()
-doInstall ghc ghcpkg topdir directory distDir
+doInstall ghc ghcpkg strip topdir directory distDir
           myDestDir myPrefix myLibdir myDocdir
           relocatableBuildStr args
  = withCurrentDirectory directory $ do
@@ -220,8 +220,16 @@ doInstall ghc ghcpkg topdir directory distDir
                                                   else [],
                                  programLocation = UserSpecified ghcpkg
                              }
+                stripProg = ConfiguredProgram {
+                              programId = programName stripProgram,
+                              programVersion = Nothing,
+                              programArgs = [],
+                              programLocation = UserSpecified strip
+                          }
                 progs' = updateProgram ghcProg
-                       $ updateProgram ghcPkgProg progs
+                       $ updateProgram ghcPkgProg
+                       $ updateProgram stripProg
+                         progs
             instInfos <- dump verbosity ghcPkgProg GlobalPackageDB
             let installedPkgs' = PackageIndex.fromList instInfos
             let mlc = libraryConfig lbi
-- 
1.7.10.4