Skip to content

Commit

Permalink
Auto merge of #160 - bgermann:master, r=japaric
Browse files Browse the repository at this point in the history
Use Solaris 10 compatible compiler triplet

This changes the solaris2.11 part of the gcc triplet
to solaris2.10, because there is a compatibility issue:
If a rust program panics on Solaris 10 the backtrace
cannot be generated because of a runtime error.

Changing the triplet works for both Solaris 10 and 11.
It is also the same triplet that is used by Rust's CI.
  • Loading branch information
homunkulus committed Nov 17, 2017
2 parents c32c3a6 + d5bc65a commit 11504da
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docker/solaris.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ main() {

local binutils=2.25.1 \
gcc=5.3.0 \
target=$arch-sun-solaris2.11
target=$arch-sun-solaris2.10

local dependencies=(
bzip2
Expand Down
6 changes: 3 additions & 3 deletions docker/sparcv9-sun-solaris/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ RUN bash /xargo.sh

COPY solaris.sh openssl.sh /
RUN bash /solaris.sh sparcv9 && \
bash /openssl.sh solaris64-sparcv9-gcc sparcv9-sun-solaris2.11-
bash /openssl.sh solaris64-sparcv9-gcc sparcv9-sun-solaris2.10-

ENV CARGO_TARGET_SPARCV9_SUN_SOLARIS_LINKER=sparcv9-sun-solaris2.11-gcc \
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-gcc \
ENV CARGO_TARGET_SPARCV9_SUN_SOLARIS_LINKER=sparcv9-sun-solaris2.10-gcc \
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
OPENSSL_DIR=/openssl \
OPENSSL_INCLUDE_DIR=/openssl/include \
OPENSSL_LIB_DIR=/openssl/lib
6 changes: 3 additions & 3 deletions docker/x86_64-sun-solaris/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ RUN bash /xargo.sh

COPY solaris.sh openssl.sh /
RUN bash /solaris.sh x86_64 && \
bash /openssl.sh solaris64-x86_64-gcc x86_64-sun-solaris2.11-
bash /openssl.sh solaris64-x86_64-gcc x86_64-sun-solaris2.10-

ENV CARGO_TARGET_X86_64_SUN_SOLARIS_LINKER=x86_64-sun-solaris2.11-gcc \
CC_x86_64_sun_solaris=x86_64-sun-solaris2.11-gcc \
ENV CARGO_TARGET_X86_64_SUN_SOLARIS_LINKER=x86_64-sun-solaris2.10-gcc \
CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
OPENSSL_DIR=/openssl \
OPENSSL_INCLUDE_DIR=/openssl/include \
OPENSSL_LIB_DIR=/openssl/lib

0 comments on commit 11504da

Please sign in to comment.