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.

Sign up for GitHub

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

base: fix xx-info failing on macOS #72

Merged
merged 1 commit into from
Jul 7, 2022
Merged

base: fix xx-info failing on macOS #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions base/xx-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ if [ -n "$TARGETPLATFORM" ]; then
fi

# detect distro vendor
# shellcheck disable=SC1091
if . /etc/os-release 2>/dev/null; then
XX_VENDOR=$ID
fi

if [ "$TARGETOS" = "darwin" ]; then
XX_VENDOR="apple"
elif [ -f /etc/os-release ]; then
# shellcheck disable=SC1091
if . /etc/os-release 2>/dev/null; then
XX_VENDOR=$ID
fi
fi

vendor=""
Expand Down Expand Up @@ -328,7 +328,7 @@ case "$1" in
echo $XX_TRIPLE
;;
"vendor")
echo $XX_VENDOR
echo "$XX_VENDOR"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validate was complaining about this one not being quoted (not sure why it only complains about this one, and not the other ones 🤷‍♂️

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this one is strange, looks good now.

;;
"libc") # this is not abi, just the prefix
echo $XX_LIBC
Expand Down