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.

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

commands: relax run-from-build-tree detection #1515

Merged
merged 2 commits into from May 10, 2018

Commits on May 10, 2018

  1. libflux/conf: add bindir attribute

    Problem: we need a way to determine the directory
    where the flux command front end is built.
    
    Add 'bindir' conf attribute for
       in tree:    ${abs_top_builddir}/src/cmd
       installed:  ${prefix}/bin
    
    Access with flux_conf_get ("bindir", flags).
    garlick committed May 10, 2018
    Copy the full SHA
    9a9f680 View commit details
    Browse the repository at this point in the history
  2. cmd/flux: reverse logic of in-tree detection

    Problem: when flux is launched by spindle, /proc/self/exe
    no longer refers to $prefix/bindir and flux attempts
    to use paths relative to its build directory to access
    the rest of flux.
    
    Instead of comparing /proc/self/exe's symlink target
    to $prefix/bindir, compare to ${abs_top_builddir}/src/cmd.
    That way the installed executable can be relocated
    without harm, and the "special" case is the one where
    flux is run out of the build tree, which seems appropriate.
    
    The problem launching flux with spindle is discussed
    in issue flux-framework#1514.
    garlick committed May 10, 2018
    Copy the full SHA
    04a71e0 View commit details
    Browse the repository at this point in the history