diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-09-26 16:06:28 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-06 08:05:57 -0500 |
| commit | ce9e2a1a9307bf43ead278dd1fc8db4325d82340 (patch) | |
| tree | bd134ac511b2d20755290d9b63505cffeb2a9518 /hadrian/src/Settings/Packages.hs | |
| parent | 3ce18700f80a12c48a029b49c6201ad2410071bb (diff) | |
| download | haskell-ce9e2a1a9307bf43ead278dd1fc8db4325d82340.tar.gz | |
configure: Add --with-libdw-{includes,libraries} flags
Fixing #17255.
Diffstat (limited to 'hadrian/src/Settings/Packages.hs')
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 0f1ae6426a..4d399ca9f0 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -199,11 +199,14 @@ rtsPackageArgs = package rts ? do libffiName <- expr libffiLibraryName ffiIncludeDir <- getSetting FfiIncludeDir ffiLibraryDir <- getSetting FfiLibDir + libdwIncludeDir <- getSetting LibdwIncludeDir + libdwLibraryDir <- getSetting LibdwLibDir -- Arguments passed to GHC when compiling C and .cmm sources. let ghcArgs = mconcat [ arg "-Irts" , arg $ "-I" ++ path + , flag WithLibdw ? if not (null libdwIncludeDir) then arg ("-I" ++ libdwIncludeDir) else mempty , arg $ "-DRtsWay=\"rts_" ++ show way ++ "\"" -- Set the namespace for the rts fs functions , arg $ "-DFS_NAMESPACE=rts" @@ -320,7 +323,8 @@ rtsPackageArgs = package rts ? do [ "-DTOP=" ++ show top , "-DFFI_INCLUDE_DIR=" ++ show ffiIncludeDir , "-DFFI_LIB_DIR=" ++ show ffiLibraryDir - , "-DFFI_LIB=" ++ show libffiName ] + , "-DFFI_LIB=" ++ show libffiName + , "-DLIBDW_LIB_DIR=" ++ show libdwLibraryDir ] , builder HsCpp ? flag HaveLibMingwEx ? arg "-DHAVE_LIBMINGWEX" ] |