Fixed Travis issues

- Fixed --disable-mixedabi option spelling
- Updated GNUstep make repository URL (was being redirected)
- Removed obsolete --enable-objc-nonfragile-abi flag
This commit is contained in:
Frederik Seiffert 2019-11-28 14:16:14 +01:00
parent 69f7130fa7
commit 0dd114e7fb
2 changed files with 5 additions and 11 deletions

View file

@ -6,13 +6,13 @@ compiler:
env:
- LIBRARY_COMBO=gnu-gnu-gnu
- LIBRARY_COMBO=ng-gnu-gnu
- LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixed-abi
- LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi
matrix:
exclude:
- compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu
- compiler: gcc
env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixed-abi
env: LIBRARY_COMBO=ng-gnu-gnu BASE_ABI=--disable-mixedabi
- compiler: clang
env: LIBRARY_COMBO=gnu-gnu-gnu
sudo: required

View file

@ -6,15 +6,9 @@ DEP_SRC=$HOME/dependency_source/
install_gnustep_make() {
cd $DEP_SRC
git clone https://github.com/gnustep/make.git
cd make
if [ $LIBRARY_COMBO = 'ng-gnu-gnu' ]
then
ADDITIONAL_FLAGS="--enable-objc-nonfragile-abi"
else
ADDITIONAL_FLAGS=""
fi
./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO $ADDITIONAL_FLAGS
git clone https://github.com/gnustep/tools-make.git
cd tools-make
./configure --prefix=$HOME/staging --with-library-combo=$LIBRARY_COMBO
make install
}