zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct quoting

Browse Source
This commit is contained in:
Erik Schnetter
2015-12-22 15:49:14 -05:00
parent 611537eaed
commit 3427174eb0
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/spack/env/cc vendored
View File

@@ -265,7 +265,7 @@ for dep in "${deps[@]}"; do
if [[ -d $dep/lib ]]; then if [[ -d $dep/lib ]]; then
# libraries+=("$dep/lib") # libraries+=("$dep/lib")
if [[ $mode = ccld ]]; then if [[ $mode = ccld ]]; then
args=("-L$dep/lib" "-Wl,-rpath,$dep/lib" "${args[@]}") args=("-L$dep/lib" "-Wl,-rpath,$dep/lib" "${args[@]}")
elif [[ $mode = ld ]]; then elif [[ $mode = ld ]]; then
args=("-L$dep/lib" "-rpath" "$dep/lib" "${args[@]}") args=("-L$dep/lib" "-rpath" "$dep/lib" "${args[@]}")
@@ -289,14 +289,14 @@ if [[ $mode = ccld ]]; then
# args=("-Wl,-rpath,$dir" "${args[@]}") # args=("-Wl,-rpath,$dir" "${args[@]}")
# fi # fi
# done # done
args=("-Wl,-rpath,$SPACK_PREFIX/lib" "-Wl,-rpath,$SPACK_PREFIX/lib64" ${args[@]}) args=("-Wl,-rpath,$SPACK_PREFIX/lib" "-Wl,-rpath,$SPACK_PREFIX/lib64" "${args[@]}")
elif [[ $mode = ld ]]; then elif [[ $mode = ld ]]; then
# for dir in "${libraries[@]}"; do # for dir in "${libraries[@]}"; do
# if [[ dir = $SPACK_INSTALL* ]]; then # if [[ dir = $SPACK_INSTALL* ]]; then
# args=("-rpath" "$dir" "${args[@]}") # args=("-rpath" "$dir" "${args[@]}")
# fi # fi
# done # done
args=("-rpath" "$SPACK_PREFIX/lib" "-rpath" "$SPACK_PREFIX/lib64" ${args[@]}) args=("-rpath" "$SPACK_PREFIX/lib" "-rpath" "$SPACK_PREFIX/lib64" "${args[@]}")
fi fi
# #
@@ -325,8 +325,7 @@ for dir in "${env_path[@]}"; do
done done
export PATH export PATH
full_command=("$command") full_command=("$command" "${args[@]}")
full_command+=("${args[@]}")
# #
# Write the input and output commands to debug logs if it's asked for. # Write the input and output commands to debug logs if it's asked for.