mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-01-01 14:44:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix to build with gcc on FreeBSD

Browse source
This commit is contained in:
Yuichiro NAITO 2017-01-18 11:02:37 +09:00
parent 3d59394174
commit e38155a6da
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bin/ruby-build
View file

@ -1236,14 +1236,17 @@ if [ -n "$noexec" ]; then
exit 1
fi
# Work around warnings building Ruby 2.0 on Clang 2.x:
# pass -Wno-error=shorten-64-to-32 if the compiler accepts it.
#
# When we set CFLAGS, Ruby won't apply its default flags, though. Since clang
# builds 1.9.x and 2.x only, where -O3 is default, we can safely set that flag.
# Ensure it's the first flag since later flags take precedence.
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"
# Apply following work around, if gcc is not available.
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.
#
# When we set CFLAGS, Ruby won't apply its default flags, though. Since clang
# builds 1.9.x and 2.x only, where -O3 is default, we can safely set that flag.
# Ensure it's the first flag since later flags take precedence.
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

6
test/compiler.bats
View file

@ -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