Attempt to fix builds on OS X

This commit is contained in:
Jeremy Soller 2017-01-02 14:46:23 -07:00
parent 9e63156c09
commit 6205765d07
2 changed files with 18 additions and 20 deletions

View file

@ -5,6 +5,7 @@ rust:
cache: cargo
os:
- linux
- osx
dist: trusty
before_install:
- if [ `uname` = "Linux" ]; then
@ -14,9 +15,7 @@ before_install:
sudo chown root:$USER /etc/fuse.conf;
fi
- if [ `uname` = "Darwin" ]; then brew update &&
brew install nasm gcc49 pkg-config Caskroom/cask/osxfuse &&
brew tap glendc/gcc_cross_compilers &&
brew install glendc/gcc_cross_compilers/x64-elf-binutils glendc/gcc_cross_compilers/x64-elf-gcc;
brew install nasm gcc49 pkg-config Caskroom/cask/osxfuse djphoenix/gcc_cross_compilers/x86_64-elf-gcc;
fi
script:
- make clean &&

View file

@ -129,8 +129,7 @@ osx_homebrew()
install_brew_pkg "pkg-config"
install_brew_cask_pkg "osxfuse"
install_brew_pkg "glendc/gcc_cross_compilers/x64-elf-binutils" "x86_64-elf-gcc"
install_brew_pkg "glendc/gcc_cross_compilers/x64-elf-gcc" "x86_64-elf-gcc"
install_brew_pkg "djphoenix/gcc_cross_compilers/x86_64-elf-gcc"
}
###############################################################################