github
/
amiga-gcc
mirror of https://github.com/bebbo/amiga-gcc.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into master

This commit is contained in:
Stefan "Bebbo" Franke 2019-06-15 10:52:12 +02:00 committed by GitHub
parent c86f62eac9 6ab5b7e0f2
commit cb89d3f1d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.travis.yml
View File

@ -1,7 +1,7 @@
branches: branches:
only: only:
- master - master
addons: addons:
homebrew: homebrew:
taps: discoteq/discoteq taps: discoteq/discoteq
packages: packages:
@ -29,17 +29,18 @@ matrix:
before_install: before_install:
- sudo mkdir /opt/amiga && sudo chown $(whoami) /opt/amiga - sudo mkdir /opt/amiga && sudo chown $(whoami) /opt/amiga
script: script:
- echo ${TRAVIS_OS_NAME} - if [ "${TRAVIS_OS_NAME}" == "osx" ];
- if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
then export CC=gcc-8;
export CC=gcc-8; export CXX=g++-8;
export CXX=g++-8; (gmake -j3 all &); while [ ! -f $(realpath build-Darwin)/gcc/_libgcc_done ]; do date; sleep 60; done;
travis_wait 60 gmake all -j3; else
else make all -j3;
travis_wait 60 make all -j3; fi
fi
- tar czf amiga-gcc-${TRAVIS_OS_NAME}.tgz /opt/amiga - tar czf amiga-gcc-${TRAVIS_OS_NAME}.tgz /opt/amiga
- ls -l - ls -l
after_failure:
- cat log/*.log
before_deploy: before_deploy:
- git config --local user.name "bebbo@travis-ci" - git config --local user.name "bebbo@travis-ci"
- git config --local user.email "bebbo@bejy.net" - git config --local user.email "bebbo@bejy.net"

2
Makefile
View File

@ -613,7 +613,7 @@ $(BUILD)/vbcc_target_m68k-amigaos.info: download/vbcc_target_m68k-amigaos.lha $(
@touch $(BUILD)/vbcc_target_m68k-amigaos.info @touch $(BUILD)/vbcc_target_m68k-amigaos.info
download/vbcc_target_m68k-amigaos.lha: download/vbcc_target_m68k-amigaos.lha:
$(L0)"downloading vbcc_target"$(L1) cd download && wget http://aminet.net/dev/c/vbcc_target_m68k-amiga.lha $(L2) $(L0)"downloading vbcc_target"$(L1) cd download && wget http://aminet.net/dev/c/vbcc_target_m68k-amiga.lha -O vbcc_target_m68k-amigaos.lha $(L2)
# ================================================= # =================================================
# L I B R A R I E S # L I B R A R I E S