From 93453dddb4bc300cf9caa3ee92ee522b6a11d33b Mon Sep 17 00:00:00 2001
From: B3n30 <benediktthomas@gmail.com>
Date: Sun, 26 Apr 2020 10:43:39 +0200
Subject: [PATCH] test: use gold instead of ld
---
.travis.yml | 1 +
.travis/linux-frozen/build.sh | 1 -
.travis/linux-frozen/deps.sh | 5 +++++
.travis/linux-frozen/docker.sh | 7 +++++++
4 files changed, 13 insertions(+), 1 deletion(-)
create mode 100755 .travis/linux-frozen/deps.sh
diff --git a/.travis.yml b/.travis.yml
index f1ddde4de..88ff10f7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,6 +43,7 @@ matrix:
dist: trusty
services: docker
cache: ccache
+ install: "./.travis/linux-frozen/deps.sh"
script: "./.travis/linux-frozen/build.sh"
- os: linux
env: NAME="MinGW build"
diff --git a/.travis/linux-frozen/build.sh b/.travis/linux-frozen/build.sh
index 287babcce..d74f28f99 100755
--- a/.travis/linux-frozen/build.sh
+++ b/.travis/linux-frozen/build.sh
@@ -1,4 +1,3 @@
#!/bin/bash -ex
mkdir -p "$HOME/.ccache"
-docker pull citraemu/build-environments:linux-frozen
docker run --env-file .travis/common/travis-ci.env -v $(pwd):/citra -v "$HOME/.ccache":/root/.ccache citraemu/build-environments:linux-frozen /bin/bash -ex /citra/.travis/linux-frozen/docker.sh
diff --git a/.travis/linux-frozen/deps.sh b/.travis/linux-frozen/deps.sh
new file mode 100755
index 000000000..9474a654b
--- /dev/null
+++ b/.travis/linux-frozen/deps.sh
@@ -0,0 +1,5 @@
+#!/bin/sh -ex
+
+sudo apt-get -y install binutils-gold
+
+docker pull citraemu/build-environments:linux-frozen
diff --git a/.travis/linux-frozen/docker.sh b/.travis/linux-frozen/docker.sh
index 39881568d..9ba646d86 100755
--- a/.travis/linux-frozen/docker.sh
+++ b/.travis/linux-frozen/docker.sh
@@ -1,5 +1,12 @@
#!/bin/bash -ex
+mkdir -p ~/bin/gold
+echo '#!/bin/bash' > ~/bin/gold/ld
+echo 'gold "$@"' >> ~/bin/gold/ld
+chmod a+x ~/bin/gold/ld
+export CFLAGS="-B$HOME/bin/gold $CFLAGS"
+export CXXFLAGS="-B$HOME/bin/gold $CXXFLAGS"
+
cd /citra
mkdir build && cd build