diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-05-31 11:20:30 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-06-04 01:10:20 -0400 |
| commit | 114b014f7ed346727241c78ef3e0bf965d94edfc (patch) | |
| tree | 8e93a5f83d350da9b92b4bd0ecebbde09cc4de7d /hadrian | |
| parent | db78ac6f5d69618ff143ab4b572e7f58a1805687 (diff) | |
| download | haskell-114b014f7ed346727241c78ef3e0bf965d94edfc.tar.gz | |
Hadrian: fix OSX build failure and add an OSX/Hadrian CI job
The OSX build failure introduced in 3aa71a22 was due to a change in the
glob we use to collect libffi shared libraries in hadrian/src/Rules/Libffi.hs.
This commit fixes the problem and adds an OSX CI job that builds GHC with
Hadrian, to make sure we don't break it again.
Diffstat (limited to 'hadrian')
| -rw-r--r-- | hadrian/src/Rules/Libffi.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hadrian/src/Rules/Libffi.hs b/hadrian/src/Rules/Libffi.hs index a1a53741db..e3f080dda1 100644 --- a/hadrian/src/Rules/Libffi.hs +++ b/hadrian/src/Rules/Libffi.hs @@ -178,7 +178,7 @@ libffiRules = do | windows = "dll" | osx = "dylib" | otherwise = "so" - filepat = "lib" ++ libffiName'' ++ "*." ++ dynlibext ++ "*" + filepat = "lib" ++ libffiName'' ++ "." ++ dynlibext ++ "*" liftIO $ getDirectoryFilesIO "." [libfilesDir -/- filepat] writeFileLines dynLibMan dynLibFiles |