Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 648c18629e6f
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9ca4b31f28d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 16, 2015

  1. Bump Travis Ruby version to 2.2.0

    OS X builds started to fail after the release of RubyGems 2.5.0, so this
    should fix it.
    ahmadsherif committed Nov 16, 2015
    Copy the full SHA
    f14fd16 View commit details
  2. Include zlib linker flag if not building with the vendored one

    Apparently building with LLVM enabled includes this flag, probably
    because of using `--system-libs`, so building without LLVM fails because
    it can't link against zlib.
    ahmadsherif committed Nov 16, 2015
    Copy the full SHA
    b9ca4b3 View commit details
Showing with 3 additions and 1 deletion.
  1. +1 −1 .travis.yml
  2. +2 −0 rakelib/blueprint.rb
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ notifications:
on_start: always

env:
- RVM=2.0.0 LANG="en_US.UTF-8"
- RVM=2.2.0 LANG="en_US.UTF-8"

os:
- linux
2 changes: 2 additions & 0 deletions rakelib/blueprint.rb
Original file line number Diff line number Diff line change
@@ -179,6 +179,8 @@
end
gcc.add_library zlib
files << zlib
else
gcc.ldflags << "-lz"
end

if Rubinius::BUILD_CONFIG[:vendor_libsodium]