Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't use installedPkgs for internal library library dirs. #4033

Merged
merged 1 commit into from
Oct 27, 2016
Merged

Don't use installedPkgs for internal library library dirs. #4033

merged 1 commit into from
Oct 27, 2016
+47 −2

Commits on Oct 25, 2016

  1. Don't use installedPkgs for internal library library dirs. 

    In 1.24, installedPkgs contained only references to the external package
database, not any internal libraries. In particular, when we built a
dynamically linked executable, installedPkgs did NOT have a reference to
the internal library; instead, depLibraryPaths has a special case
(hasInternalDeps) to add the final libdir to the RPATH.

In HEAD, after 0d15ede, we started adding internal libraries (with the
INPLACE registrations) to installedPkgs to fix haskell#2971.  But depLibraryPaths
was not updated, which means that the inplace registrations got picked
up and added to the RPATH, resulting in bad temporary directories
showing up in RPATHs.

In this commit, we just filter out internal entries from installedPkgs
and compute the library dirs for them from scratch (this code already
existed, so no loss!)

Fixes haskell#4025.

Signed-off-by: Edward Z. Yang <[email protected]>
    @ezyang
    ezyang committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    a1107e2 View commit details
    Browse the repository at this point in the history