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

MINOR: [R] Avoid stray output from expr when checking for 10.13 #38303

Merged
merged 5 commits into from
Oct 17, 2023
Merged

MINOR: [R] Avoid stray output from expr when checking for 10.13 #38303

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a56ce03
don't use expr to check for 10.13
assignUser Oct 17, 2023
080d52e
Revert "don't use expr to check for 10.13"
assignUser Oct 17, 2023
1780fe4
redirect all output
assignUser Oct 17, 2023
efd3f83
add comment
assignUser Oct 17, 2023
053aae8
Update r/configure
jonkeane Oct 17, 2023
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
5 changes: 4 additions & 1 deletion r/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,10 @@ set_pkg_vars () {
PKG_CFLAGS="$PKG_CFLAGS $ARROW_R_CXXFLAGS"
fi

if [ "$UNAME" = "Darwin" ] && expr $(sw_vers -productVersion) : '10\.13'; then
# We use expr because the product version returns more than just 10.13 and we want to
# match the substring. However, expr always outputs the number of matched characters
# to stdout, to avoid noise in the log we redirect the output to /dev/null
if [ "$UNAME" = "Darwin" ] && expr $(sw_vers -productVersion) : '10\.13' >/dev/null 2>&1; then
Copy link
Member

Choose a reason for hiding this comment

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

Could you add a comment here about why expr + why >/dev/null 2>&1 ?

assignUser marked this conversation as resolved.
Show resolved Hide resolved
# avoid C++17 availability warnings on macOS < 11
PKG_CFLAGS="$PKG_CFLAGS -D_LIBCPP_DISABLE_AVAILABILITY"
fi
Expand Down
Loading