Commit 8f68b8bc authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Fix CI regression, minor revision.

See #183.
parent 875d9ca4
......@@ -106,7 +106,7 @@ iconv-lib-dir = @ICONV_LIB_DIRS@
gmp-include-dir = @GMP_INCLUDE_DIRS@
gmp-lib-dir = @GMP_LIB_DIRS@
use-system-ffi = @UseSystemLibFFI@
use-system-ffi = @UseSystemLibFFI@
ffi-include-dir = @FFIIncludeDir@
ffi-lib-dir = @FFILibDir@
......
......@@ -64,8 +64,8 @@ configureIntGmpArguments :: Action [String]
configureIntGmpArguments = do
includes <- setting GmpIncludeDir
libs <- setting GmpLibDir
return $ map ("--with-gmp-includes=" ++) [includes]
++ map ("--with-gmp-libraries=" ++) [libs]
return $ map ("--with-gmp-includes=" ++) (words includes)
++ map ("--with-gmp-libraries=" ++) (words libs)
-- TODO: we rebuild gmp every time.
gmpRules :: Rules ()
......
......@@ -71,13 +71,13 @@ libffiRules :: Rules ()
libffiRules = do
libffiDependencies &%> \_ -> do
when trackBuildSystem $ need [sourcePath -/- "Rules/Libffi.hs"]
ffi_header_dir <- setting FfiIncludeDir
use_system_ffi <- flag UseSystemFfi
if use_system_ffi
ffiHeaderDir <- setting FfiIncludeDir
useSystemFfi <- flag UseSystemFfi
if useSystemFfi
then do
putBuild "| System supplied FFI library will be used"
forM_ ["ffi.h", "ffitarget.h"] $ \file -> do
let src = ffi_header_dir -/- file
let src = ffiHeaderDir -/- file
copyFile src (rtsBuildPath -/- file)
putSuccess $ "| Successfully copied system supplied FFI library header files"
else do
......
......@@ -32,7 +32,7 @@ hsc2hsBuilderArgs = builder Hsc2Hs ? do
mconcat [ arg $ "--cc=" ++ ccPath
, arg $ "--ld=" ++ ccPath
, notM windowsHost ? arg "--cross-safe"
, append $ map ("-I" ++) [gmpDir]
, append . map ("-I" ++) $ words gmpDir
, append $ map ("--cflag=" ++) cFlags
, append $ map ("--lflag=" ++) lFlags
, notStage0 ? crossCompiling ? arg "--cross-compile"
......
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