Commit 2f52d196 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Merge pull request #115 from angerman/feature/libtool

Set CONFIG_SHELL, such that libtool obtains the bash header.
parents f8d9ddc5 7b5c5bf2
......@@ -94,7 +94,11 @@ runConfigure :: FilePath -> [CmdOption] -> [String] -> Action ()
runConfigure dir opts args = do
need [dir -/- "configure"]
putBuild $ "| Run configure in " ++ dir ++ "..."
quietly $ cmd Shell (EchoStdout False) [Cwd dir] "bash configure" opts args
quietly $ cmd Shell (EchoStdout False) [Cwd dir] "bash configure" opts' args
where
-- Always configure with bash.
-- This also injects /bin/bash into `libtool`, instead of /bin/sh
opts' = opts ++ [AddEnv "CONFIG_SHELL" "/bin/bash"]
runMake :: FilePath -> [String] -> Action ()
runMake dir args = do
......
......@@ -114,7 +114,7 @@ integerGmpRules = do
copyFile integerGmpLibraryFakeH integerGmpLibraryH
else do
putBuild "| No GMP framework detected; in tree GMP will be built"
runMake integerGmpBuild ["MAKEFLAGS='LIBTOOL=bash\\ libtool'"]
runMake integerGmpBuild ["MAKEFLAGS="]
copyFile (integerGmpBuild -/- "gmp.h") integerGmpLibraryInTreeH
copyFile (integerGmpBuild -/- "gmp.h") integerGmpLibraryH
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment