Commit f6c7d8df authored by SHIBATA Hiroshi's avatar SHIBATA Hiroshi Committed by GitHub
Browse files

Merge pull request #1046 from yuichiro-naito/gcc_on_freebsd 

gcc is installed on FreeBSD
parents 8fb210ac c9088ca4

bin/ruby-build

+11 −8
Original line number Diff line number Diff line
@@ -1239,6 +1239,8 @@ if [ -n "$noexec" ]; then 
  exit 1

fi



# Apply following work around, if gcc is not installed.

if [ -z "$(locate_gcc)" ]; then

  # Work around warnings building Ruby 2.0 on Clang 2.x:

  # pass -Wno-error=shorten-64-to-32 if the compiler accepts it.

  #
@@ -1248,6 +1250,7 @@ fi 
  if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then

    RUBY_CFLAGS="-O3 -Wno-error=shorten-64-to-32 $RUBY_CFLAGS"

  fi

fi



if [ -z "$MAKE" ]; then

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

test/compiler.bats

+3 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ export -n RUBY_CONFIGURE_OPTS 
@test "require_gcc on OS X 10.9" {

  stub uname '-s : echo Darwin'

  stub sw_vers '-productVersion : echo 10.9.5'

  stub gcc '--version : echo 4.2.1'

  stub gcc '--version : echo 4.2.1' '--version : echo 4.2.1'



  run_inline_definition <<DEF

require_gcc
@@ -27,7 +27,7 @@ OUT 
@test "require_gcc on OS X 10.10" {

  stub uname '-s : echo Darwin'

  stub sw_vers '-productVersion : echo 10.10'

  stub gcc '--version : echo 4.2.1'

  stub gcc '--version : echo 4.2.1' '--version : echo 4.2.1'



  run_inline_definition <<DEF

require_gcc
@@ -42,7 +42,7 @@ OUT 
}



@test "require_gcc silences warnings" {

  stub gcc '--version : echo warning >&2; echo 4.2.1'

  stub gcc '--version : echo warning >&2; echo 4.2.1' '--version : echo warning >&2; echo 4.2.1'



  run_inline_definition <<DEF

require_gcc