diff options
| author | Bryan O'Sullivan <bos@serpentine.com> | 2013-09-13 13:13:04 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bryano@fb.com> | 2013-09-15 10:07:39 -0700 |
| commit | 865956a6ccd88e71aa07a33667242b95ecf98793 (patch) | |
| tree | 28a28a2eeb3c7ce4de968dfd985a06139f1bac0c /utils/ghc-cabal | |
| parent | 81610b0ecbd718590b7b9afa749fc8b81633d6fc (diff) | |
| download | haskell-865956a6ccd88e71aa07a33667242b95ecf98793.tar.gz | |
Cause "make install" to install dynamic libraries (#8194)
Our special ghc-cabal command needs to be told that we are building with
dynamic library support when it does its copying. We do so by passing an
extra parameter from ghc.mk.
Diffstat (limited to 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 7d1d9bcc92..8fa2c29113 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -40,9 +40,10 @@ main = do hSetBuffering stdout LineBuffering doCheck dir "copy" : dir : distDir : strip : myDestDir : myPrefix : myLibdir : myDocdir - : args' -> + : ghcLibWays : args' -> doCopy dir distDir strip myDestDir myPrefix myLibdir myDocdir + ("dyn" `elem` words ghcLibWays) args' "register" : dir : distDir : ghc : ghcpkg : topdir : myDestDir : myPrefix : myLibdir : myDocdir @@ -127,11 +128,11 @@ runHsColour directory distdir args $ defaultMainArgs ("hscolour" : "--builddir" : distdir : args) doCopy :: FilePath -> FilePath - -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath + -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> Bool -> [String] -> IO () doCopy directory distDir - strip myDestDir myPrefix myLibdir myDocdir + strip myDestDir myPrefix myLibdir myDocdir withSharedLibs args = withCurrentDirectory directory $ do let copyArgs = ["copy", "--builddir", distDir] @@ -172,7 +173,8 @@ doCopy directory distDir progs' <- configureProgram verbosity stripProgram' progs let lbi' = lbi { withPrograms = progs', - installDirTemplates = idts + installDirTemplates = idts, + withSharedLib = withSharedLibs } f pd lbi' us flags |