Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix var quoting in cc #290

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions share/toolchain/shim
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

tool=$(basename $0)
tool=$(basename "$0")

if [ $(uname) != Darwin ]; then
if [ "$(uname)" != Darwin ]; then
if [ -x /usr/local/bin/pkgx ]; then
# removed from PATH deliberately
#TODO like, probs we should set PKGX or something before removing it from PATH
Expand All @@ -22,7 +22,7 @@ if [ $(uname) != Darwin ]; then

filtered_args=()
for arg in "$@"; do
if [ $arg != -Werror ]; then
if [ "$arg" != -Werror ]; then
filtered_args+=("$arg")
fi
done
Expand All @@ -41,10 +41,10 @@ ld|lld|lld-link|ld64.lld)
fi
done

exec /usr/bin/$tool "$@" -rpath "${PKGX_DIR:-$HOME/.pkgx}"
exec /usr/bin/"$tool" "$@" -rpath "${PKGX_DIR:-$HOME/.pkgx}"
;;
*)
exec /usr/bin/$tool "$@"
exec /usr/bin/"$tool" "$@"
;;
esac

Expand Down
Loading