From ed90322caa41aa694470b4cb906ccba332d06f35 Mon Sep 17 00:00:00 2001 From: cancel Date: Thu, 29 Nov 2018 17:55:25 +0900 Subject: [PATCH] Cleanup --- tool | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tool b/tool index 3bdb820..fc37910 100755 --- a/tool +++ b/tool @@ -86,11 +86,11 @@ fi # This is not perfect by any means cc_id= compiler_vers= -if ${compiler_exe} --version | grep -q clang 2> /dev/null; then +if "$compiler_exe" --version | grep -q clang 2> /dev/null; then cc_id=clang - compiler_vers=$(${compiler_exe} -dumpversion) + compiler_vers=$("$compiler_exe" -dumpversion) # Only gcc has -dumpfullversion -elif compiler_vers=$(${compiler_exe} -dumpfullversion 2> /dev/null); then +elif compiler_vers=$("$compiler_exe" -dumpfullversion 2> /dev/null); then cc_id=gcc fi @@ -173,7 +173,7 @@ build_target() { try_make_dir "$build_dir/$build_subdir" # bash versions quirk: empty arrays might give error on expansion, use + # trick to avoid expanding second operand - verbose_echo "${compiler_exe}" "${compiler_flags[@]}" -o "$build_dir/$build_subdir/$out_exe" "${source_files[@]}" ${libraries[@]+"${libraries[@]}"} + verbose_echo "$compiler_exe" "${compiler_flags[@]}" -o "$build_dir/$build_subdir/$out_exe" "${source_files[@]}" ${libraries[@]+"${libraries[@]}"} } shift $((OPTIND - 1))