Skip to content

Commit 4878ed1

Browse files
committed
Help backtrace-sys find cross objcopy
1 parent a26f875 commit 4878ed1

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
sudo: required
22
dist: trusty
3+
language: generic
34
services:
45
- docker
56

ci/run-docker.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ case $TARGET in
112112
;;
113113
powerpc64-*-linux-*)
114114
OPENSSL_OS=linux-ppc64
115-
OPENSSL_CC=powerpc64-linux-gnu-gcc-5
115+
OPENSSL_CC=powerpc64-linux-gnu-gcc
116116
OPENSSL_AR=powerpc64-linux-gnu-ar
117117
OPENSSL_CFLAGS=-m64
118118
;;
@@ -202,4 +202,21 @@ export CARGO_TARGET_DIR=`pwd`/target
202202
export CARGO_HOME=`pwd`/target/cargo-home
203203
export CARGO_TARGET_${upper_target}_LINKER=$OPENSSL_CC
204204

205+
# Some targets have trouble finding the cross objcopy for building backtrace-sys.
206+
# Give them some help.
207+
case $TARGET in
208+
powerpc64-*-linux-*)
209+
OBJCOPY=powerpc64-linux-gnu-objcopy
210+
;;
211+
mips-*-linux-*)
212+
OBJCOPY=mips-linux-gnu-objcopy
213+
;;
214+
mipsel-*-linux-*)
215+
OBJCOPY=mipsel-linux-gnu-objcopy
216+
;;
217+
x86_64-linux-android)
218+
OBJCOPY=x86_64-linux-android-objcopy
219+
;;
220+
esac
221+
205222
exec sh ci/run.sh

0 commit comments

Comments
 (0)