Skip to content
Snippets Groups Projects
Commit 8742dd2c authored by Oleg Grenrus's avatar Oleg Grenrus
Browse files

Add autogen include directories for inplace packages

Local packages may have include heades in
- `inplaceDir </> d` (bundled, in source tree)
- `inplaceDir </> libTargetDir </> d` (autogenerated, somewhere in
  builddir)

We need both, for dependant packages to work.

The simple reproduce case is to have `unix` and `process`
locally in the project and try to build `process`.
parent 77aed9d4
No related branches found
No related tags found
No related merge requests found
......@@ -500,7 +500,10 @@ inplaceInstalledPackageInfo inplaceDir distPref pkg abi_hash lib lbi clbi =
generalInstalledPackageInfo adjustRelativeIncludeDirs
pkg abi_hash lib lbi clbi installDirs
where
adjustRelativeIncludeDirs = map (inplaceDir </>)
adjustRelativeIncludeDirs = concatMap $ \d ->
[ inplaceDir </> d -- local include-dir
, inplaceDir </> libTargetDir </> d -- autogen include-dir
]
libTargetDir = componentBuildDir lbi clbi
installDirs =
(absoluteComponentInstallDirs pkg lbi (componentUnitId clbi) NoCopyDest) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment