vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Attempt to fix builds on OS X

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.travis.yml
View file

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

3
bootstrap.sh
View file

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