mirror of
https://github.com/notwa/rc
synced 2024-07-02 11:47:12 -07:00
failed globbing is not (always) an error
This commit is contained in:
parent
4065a72d4a
commit
d6cb7ea4dc
|
@ -33,7 +33,7 @@ compile() {
|
||||||
if [ -z "$clang" ]; then
|
if [ -z "$clang" ]; then
|
||||||
# maybe we have clang-msvc installed
|
# maybe we have clang-msvc installed
|
||||||
local dir
|
local dir
|
||||||
printf "%s\n" "/c/Program Files/LLVM"*(On/[1]) | read -r dir
|
printf "%s\n" "/c/Program Files/LLVM"*(On/N[1]) | read -r dir
|
||||||
if [ -d "$dir" ] && [ -e "$dir/bin/clang" ]; then
|
if [ -d "$dir" ] && [ -e "$dir/bin/clang" ]; then
|
||||||
clang="$dir/bin/clang"
|
clang="$dir/bin/clang"
|
||||||
export PATH="$PATH:$dir/bin/"
|
export PATH="$PATH:$dir/bin/"
|
||||||
|
@ -44,16 +44,16 @@ compile() {
|
||||||
[ "$MSYSTEM" = MINGW64 ] && clarch="/amd64" || clarch=""
|
[ "$MSYSTEM" = MINGW64 ] && clarch="/amd64" || clarch=""
|
||||||
local arch
|
local arch
|
||||||
[ "$MSYSTEM" = MINGW64 ] && arch="x64" || arch="x86"
|
[ "$MSYSTEM" = MINGW64 ] && arch="x64" || arch="x86"
|
||||||
printf "%s\n" "/c/Program Files (x86)/Microsoft Visual Studio "*(On/[1]) | read vc
|
printf "%s\n" "/c/Program Files (x86)/Microsoft Visual Studio "*(On/N[1]) | read vc
|
||||||
vc="$vc/VC"
|
vc="$vc/VC"
|
||||||
if [ -d "$vc/bin$clarch" ] && [ -e "${vc}/bin$clarch/$cl" ]; then
|
if [ -d "$vc/bin$clarch" ] && [ -e "${vc}/bin$clarch/$cl" ]; then
|
||||||
cl="${vc}/bin$clarch/cl"
|
cl="${vc}/bin$clarch/cl"
|
||||||
vc="$vc"
|
vc="$vc"
|
||||||
|
|
||||||
local winkit
|
local winkit
|
||||||
printf "%s\n" "/c/Program Files (x86)/Windows Kits/"*(on/[1]) | read -r winkit
|
printf "%s\n" "/c/Program Files (x86)/Windows Kits/"*(on/N[1]) | read -r winkit
|
||||||
[ -n "$winkit" ] || { echo "failed glob; missing winkit" >&2; return 1 }
|
[ -n "$winkit" ] || { echo "failed glob; missing winkit" >&2; return 1 }
|
||||||
printf "%s\n" "$winkit/Lib/"*(On/[1]) | read -r winkit
|
printf "%s\n" "$winkit/Lib/"*(On/N[1]) | read -r winkit
|
||||||
[ -n "$winkit" ] || { echo "failed glob; missing winkit" >&2; return 1 }
|
[ -n "$winkit" ] || { echo "failed glob; missing winkit" >&2; return 1 }
|
||||||
|
|
||||||
export PATH="$PATH:$vc/bin$clarch"
|
export PATH="$PATH:$vc/bin$clarch"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user