Merge branch 'freebsd-make'

bin/ruby-build

@@ -793,7 +793,11 @@ if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then
 fi
 
 if [ -z "$MAKE" ]; then
-  export MAKE="make"
+  if [[ "FreeBSD" = "$(uname -s)" ]]; then
+    export MAKE="gmake"
+  else
+    export MAKE="make"
+  fi
 fi
 
 if [ -n "$RUBY_BUILD_CACHE_PATH" ] && [ -d "$RUBY_BUILD_CACHE_PATH" ]; then

test/build.bats

@@ -2,6 +2,7 @@
 
 load test_helper
 export RUBY_BUILD_CACHE_PATH="$TMP/cache"
+export MAKE=make
 
 setup() {
   mkdir -p "$INSTALL_ROOT"
@@ -32,8 +33,8 @@ OUT
 }
 
 stub_make_install() {
-  stub make \
-    ' : echo make "$@" >> build.log' \
+  stub "$MAKE" \
+    " : echo \"$MAKE \$@\" >> build.log" \
     "install : cat build.log >> '$INSTALL_ROOT/build.log'"
 }
 
@@ -92,3 +93,16 @@ OUT
   assert_success
   assert [ -x ./here/bin/package ]
 }
+
+@test "make on FreeBSD defaults to gmake" {
+  cached_tarball "ruby-2.0.0"
+
+  stub uname "-s : echo FreeBSD"
+  MAKE=gmake stub_make_install
+
+  MAKE= install_fixture definitions/vanilla-ruby
+  assert_success
+
+  unstub gmake
+  unstub uname
+}

test/fixtures/definitions/vanilla-ruby

+install_package "ruby-2.0.0" "http://ruby-lang.org/ruby/2.0/ruby-2.0.0.tar.gz"