Commit 0170728d authored by Mislav Marohnić's avatar Mislav Marohnić
Browse files

Merge pull request #630 from sstephenson/freebsd-make 

On FreeBSD 10, stop defaulting to MAKE=gmake
parents c2eb5e2a 60a5abeb

bin/ruby-build

+1 −1
Original line number Diff line number Diff line
@@ -1048,7 +1048,7 @@ if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then 
fi



if [ -z "$MAKE" ]; then

  if [[ "FreeBSD" = "$(uname -s)" ]]; then

  if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then

    export MAKE="gmake"

  else

    export MAKE="make"

test/build.bats

+14 −2
Original line number Diff line number Diff line
@@ -318,10 +318,10 @@ OUT 
  assert [ -x ./here/bin/package ]

}



@test "make on FreeBSD defaults to gmake" {

@test "make on FreeBSD 9 defaults to gmake" {

  cached_tarball "ruby-2.0.0"



  stub uname "-s : echo FreeBSD"

  stub uname "-s : echo FreeBSD" "-r : echo 9.1"

  MAKE=gmake stub_make_install



  MAKE= install_fixture definitions/vanilla-ruby
@@ -331,6 +331,18 @@ OUT 
  unstub uname

}



@test "make on FreeBSD 10" {

  cached_tarball "ruby-2.0.0"



  stub uname "-s : echo FreeBSD" "-r : echo 10.0-RELEASE"

  stub_make_install



  MAKE= install_fixture definitions/vanilla-ruby

  assert_success



  unstub uname

}



@test "can use RUBY_CONFIGURE to apply a patch" {

  cached_tarball "ruby-2.0.0"