summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkr3nshaw <20672068+kr3nshaw@users.noreply.github.com>2020-06-08 03:26:25 +1000
committerkr3nshaw <20672068+kr3nshaw@users.noreply.github.com>2020-06-08 03:26:25 +1000
commite6cf189c302f8a0659dddccd38b1819239618e0b (patch)
tree949fd0c70f54eaba2291368ecd4b2ac47a030362
parentbc4f89e2ba8a1fda915099e7e680a45beed2b0ae (diff)
My turn to try and fix Travis
-rw-r--r--.travis.yml4
-rw-r--r--tools/knarc/Makefile4
2 files changed, 5 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 0a8b0971..c3e24b01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
dist: bionic
-sudo: false
+sudo: require
language: c
env:
global:
@@ -29,6 +29,8 @@ install:
- mv NITRO\ SDK\ v3.0/include/nitro/specfiles/ARM9-TS.lcf.template arm9
script:
+ - sudo ln -s /usr/bin/gcc-8 /usr/local/bin/gcc
+ - sudo ln -s /usr/bin/g++-8 /usr/local/bin/g++
- make
notifications:
diff --git a/tools/knarc/Makefile b/tools/knarc/Makefile
index da52e871..a466912c 100644
--- a/tools/knarc/Makefile
+++ b/tools/knarc/Makefile
@@ -1,7 +1,7 @@
all: knarc
knarc: Source.cpp Narc.cpp
- g++8 -std=c++17 -o knarc Source.cpp Narc.cpp
+ g++ -std=c++17 -o knarc Source.cpp Narc.cpp
clean:
- rm knarc \ No newline at end of file
+ rm knarc