Skip to content

Commit

Permalink
use symbols instead of strings
Browse files Browse the repository at this point in the history
  • Loading branch information
chouquette committed Sep 27, 2024
1 parent 5e15606 commit ac0d176
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/omnibus/software.rb
Original file line number Diff line number Diff line change
Expand Up @@ -787,15 +787,15 @@ def with_standard_compiler_flags(env = {}, opts = {})
else
flags = {
# -z origin makes the rpath interpret the $ORIGIN variable as the binary path
"LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib,-z,origin -L#{install_dir}/embedded/lib -Wl,-rpath-link=#{install_dir}/embedded/lib",
"LDFLAGS" => "-Wl,-rpath,#{install_dir}/embedded/lib,-z,origin -L#{install_dir}/embedded/lib -Wl,-rpath-link=#{install_dir}/embedded/lib",
"CFLAGS" => "-I#{install_dir}/embedded/include -O2",
}
# List of environment variables to forward and potentially map to an alternate name
# If the value is nil, the key will simply be forwarded from ENV to flags
to_forward = {
"DD_CC" => "CC",
"DD_CXX" => "CXX",
"DD_CMAKE_TOOLCHAIN" => nil,
DD_CC: "CC",
DD_CXX: "CXX",
DD_CMAKE_TOOLCHAIN: nil,
}
to_forward.each do |orig, forwarded|
if ENV[orig]
Expand Down

0 comments on commit ac0d176

Please sign in to comment.