Unverified Commit 21efd0b5 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov Committed by GitHub
Browse files

Merge pull request #4897 from haskell/angerman-bundled-lib-order

Change order of hsLibraries
parents 7eb99035 15914720
......@@ -430,10 +430,9 @@ generalInstalledPackageInfo adjustRelIncDirs pkg abi_hash lib lbi clbi installDi
IPI.libraryDirs = libdirs,
IPI.libraryDynDirs = dynlibdirs,
IPI.dataDir = datadir installDirs,
IPI.hsLibraries = extraBundledLibs bi
++ if hasLibrary
then [getHSLibraryName (componentUnitId clbi)]
else [],
IPI.hsLibraries = (if hasLibrary
then [getHSLibraryName (componentUnitId clbi)]
else []) ++ extraBundledLibs bi,
IPI.extraLibraries = extraLibs bi,
IPI.extraGHCiLibraries = extraGHCiLibs bi,
IPI.includeDirs = absinc ++ adjustRelIncDirs relinc,
Supports Markdown
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