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: 0bc749b30304
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd1b24ad848d
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 10, 2015

  1. Fix OSX build to use llvm35

    tamird committed Jun 10, 2015
    Copy the full SHA
    5860d36 View commit details
  2. Unspecify OSX image

    Apparently this causes Travis to run linux builds on OSX?!
    tamird committed Jun 10, 2015
    Copy the full SHA
    61195f9 View commit details

Commits on Jun 11, 2015

  1. Merge pull request #3433 from tamird/fix-configure

    Fix OSX build to use llvm35
    brixen committed Jun 11, 2015
    Copy the full SHA
    dd1b24a View commit details
Showing with 5 additions and 7 deletions.
  1. +3 −5 .travis.yml
  2. +2 −2 configure
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -8,15 +8,15 @@ before_install:
- echo $LANG
- echo $LC_ALL
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y llvm-3.4 llvm-3.4-dev; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm && brew link --force llvm; fi
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm35 && brew link --force llvm35; fi
- rvm use $RVM --install --binary --fuzzy
- gem update --system
- gem --version

before_script:
- travis_retry bundle
- if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config llvm-config-3.4; fi
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure --llvm-config /usr/local/opt/llvm/bin/llvm-config; fi
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure; fi

script: rake ci

@@ -49,6 +49,4 @@ env:

os:
- linux
# - osx

osx_image: xcode61
- osx
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
@@ -577,8 +577,8 @@ class Configure
if macports?
config = macports_llvm_config
else
out = Bundler.with_clean_env { `brew list llvm | grep '/llvm-config$'` }
config = out.chomp if $?.success?
out = Bundler.with_clean_env { `brew --prefix llvm35` }.chomp
config = "#{out}/bin/llvm-config-3.5" if $?.success?
end
end
end