Skip to content

Commit

Permalink
[bldr-build] Only add runtime deps to LD_RUN_PATH.
Browse files Browse the repository at this point in the history
This resolves an issue where build time dependencies were being added to
the RPATH/RUNPATH of ELF binaries.
  • Loading branch information
fnichol committed Dec 22, 2015
1 parent 8630cb1 commit a260b6c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion plans/bldr-build
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ _build_environment() {
path_part="$path_part:$pkg_path/$path"
fi
done
for dep_path in "${pkg_all_deps_resolved[@]}"; do
for dep_path in "${pkg_deps_resolved[@]}"; do
if [[ -f "$dep_path/LD_RUN_PATH" ]]; then
local data=$(cat $dep_path/LD_RUN_PATH)
local trimmed=$(trim $data)
Expand All @@ -883,6 +883,8 @@ _build_environment() {
export LD_RUN_PATH="$trimmed"
fi
fi
done
for dep_path in "${pkg_all_deps_resolved[@]}"; do
if [[ -f "$dep_path/CFLAGS" ]]; then
local data=$(cat $dep_path/CFLAGS)
local trimmed=$(trim $data)
Expand Down

1 comment on commit a260b6c

@chef-delivery
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delivery Status:

Verify Build Acceptance
Unit Unit Provision
Lint Lint Deploy
Syntax Syntax Smoke
Quality Functional
Security
Publish

Please sign in to comment.