Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
6e232f49
Commit
6e232f49
authored
Nov 08, 2009
by
Ian Lynagh
Browse files
Tell ghc-cabal what strip program to use
parent
0434f5bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
ghc.mk
View file @
6e232f49
...
...
@@ -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'
\
...
...
utils/ghc-cabal/ghc-cabal.hs
View file @
6e232f49
...
...
@@ -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
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment