Skip to content

Commit

Permalink
Merge pull request rbenv#1219 from eregon/truffleruby-remove-early-ll…
Browse files Browse the repository at this point in the history
…vm-check

Remove early check for LLVM when installing TruffleRuby
  • Loading branch information
hsbt authored Jul 14, 2018
2 parents ad8f3a4 + 0ec626b commit b6428c7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
8 changes: 0 additions & 8 deletions bin/ruby-build
Original file line number Diff line number Diff line change
Expand Up @@ -729,14 +729,6 @@ fix_jruby_shebangs() {
}

build_package_truffleruby() {
if ! opt --version &>/dev/null; then
echo ""
echo "TruffleRuby requires LLVM to be installed to run native extensions."
echo "For more details and for setup instructions for your system, please see:"
echo "https://github.com/oracle/truffleruby/blob/master/doc/user/installing-llvm.md"
exit 1
fi

build_package_copy

cd "${PREFIX_PATH}"
Expand Down
15 changes: 0 additions & 15 deletions test/build.bats
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,6 @@ DEF
echo Running post-install hook
OUT
cached_tarball "truffleruby-test" bin/truffleruby
stub opt true

run_inline_definition <<DEF
install_package "truffleruby-test" "URL" truffleruby
Expand All @@ -648,20 +647,6 @@ DEF
assert_output_contains "Running post-install hook"
}

@test "TruffleRuby LLVM missing" {
executable "${RUBY_BUILD_CACHE_PATH}/truffleruby-test/lib/truffle/post_install_hook.sh" <<OUT
echo Running post-install hook
OUT
cached_tarball "truffleruby-test" bin/truffleruby
stub opt false

run_inline_definition <<DEF
install_package "truffleruby-test" "URL" truffleruby
DEF
assert_failure
assert_output_contains "TruffleRuby requires LLVM to be installed to run native extensions."
}

@test "non-writable TMPDIR aborts build" {
export TMPDIR="${TMP}/build"
mkdir -p "$TMPDIR"
Expand Down

0 comments on commit b6428c7

Please sign in to comment.