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

Compiler wrapper linting (#20249)

Browse Source 
* Fix duplicate entries in case
* make sure the arg is not interpreted as two items in a list
* use -n over ! -z
This commit is contained in:
Harmen Stoppels 2020-12-08 03:58:19 +01:00 committed by GitHub
parent 98c2627132
commit 50f8332d95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/env/cc vendored
View File

@ -125,7 +125,7 @@ case "$command" in
comp="FC" comp="FC"
lang_flags=F lang_flags=F
;; ;;
f77|xlf|xlf_r|pgf77|frt|flang) f77|xlf|xlf_r|pgf77)
command="$SPACK_F77" command="$SPACK_F77"
language="Fortran 77" language="Fortran 77"
comp="F77" comp="F77"
@ -440,7 +440,7 @@ then
ld) ld)
flags=("${flags[@]}" -headerpad_max_install_names) ;; flags=("${flags[@]}" -headerpad_max_install_names) ;;
ccld) ccld)
flags=("${flags[@]}" -Wl,-headerpad_max_install_names) ;; flags=("${flags[@]}" "-Wl,-headerpad_max_install_names") ;;
esac esac
fi fi
@ -518,12 +518,12 @@ for dir in "${system_libdirs[@]}"; do args+=("-L$dir"); done
# RPATHs arguments # RPATHs arguments
case "$mode" in case "$mode" in
ccld) ccld)
if [ ! -z "$dtags_to_add" ] ; then args+=("$linker_arg$dtags_to_add") ; fi if [ -n "$dtags_to_add" ] ; then args+=("$linker_arg$dtags_to_add") ; fi
for dir in "${rpaths[@]}"; do args+=("$rpath$dir"); done for dir in "${rpaths[@]}"; do args+=("$rpath$dir"); done
for dir in "${system_rpaths[@]}"; do args+=("$rpath$dir"); done for dir in "${system_rpaths[@]}"; do args+=("$rpath$dir"); done
;; ;;
ld) ld)
if [ ! -z "$dtags_to_add" ] ; then args+=("$dtags_to_add") ; fi if [ -n "$dtags_to_add" ] ; then args+=("$dtags_to_add") ; fi
for dir in "${rpaths[@]}"; do args+=("-rpath" "$dir"); done for dir in "${rpaths[@]}"; do args+=("-rpath" "$dir"); done
for dir in "${system_rpaths[@]}"; do args+=("-rpath" "$dir"); done for dir in "${system_rpaths[@]}"; do args+=("-rpath" "$dir"); done
;; ;;