Skip to content

Commit 4cec390

Browse files
Freakymislav
andauthored
Set default MAKE=make on FreeBSD (#2263)
This was set to gmake in #1381 as a workaround for https://bugs.ruby-lang.org/issues/16331 YJIT builds in Ruby 3.3 previews require the use of BSD make on these platforms, and no supported version of MRI requires the use of gmake, so revert this. JRuby continues to require gmake for jruby-launcher. Fixes #2262 Co-authored-by: Mislav Marohnić <[email protected]>
1 parent 51071a4 commit 4cec390

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

bin/ruby-build

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,12 +1357,8 @@ if [ -n "$noexec" ]; then
13571357
fi
13581358

13591359
if [ -z "$MAKE" ]; then
1360-
if is_freebsd; then
1361-
# Workaround for Ruby bug 16331: https://bugs.ruby-lang.org/issues/16331
1362-
# Due to this bug, build will fail with FreeBSD's make after #1368
1363-
# The bug is already fixed in upstream but GNU make is still required
1364-
# when building older releases of Ruby. Use GNU make rather than switching
1365-
# depending of Ruby version.
1360+
if is_freebsd && [[ $1 == jruby-* ]]; then
1361+
# jruby-launcher requires gmake: https://github.com/ruby/ruby/pull/8591
13661362
export MAKE="gmake"
13671363
else
13681364
export MAKE="make"

test/build.bats

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -404,19 +404,6 @@ OUT
404404
assert [ -x ./here/bin/package ]
405405
}
406406

407-
@test "make on FreeBSD defaults to gmake" {
408-
cached_tarball "ruby-2.0.0"
409-
410-
stub_repeated uname "-s : echo FreeBSD"
411-
MAKE=gmake stub_make_install
412-
413-
MAKE= install_fixture definitions/vanilla-ruby
414-
assert_success
415-
416-
unstub gmake
417-
unstub uname
418-
}
419-
420407
@test "can use RUBY_CONFIGURE to apply a patch" {
421408
cached_tarball "ruby-2.0.0"
422409

0 commit comments

Comments
 (0)