Skip to content

Commit 11504da

Browse files
committed
Auto merge of #160 - bgermann:master, r=japaric
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.
2 parents c32c3a6 + d5bc65a commit 11504da

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docker/solaris.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ main() {
55

66
local binutils=2.25.1 \
77
gcc=5.3.0 \
8-
target=$arch-sun-solaris2.11
8+
target=$arch-sun-solaris2.10
99

1010
local dependencies=(
1111
bzip2

docker/sparcv9-sun-solaris/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ RUN bash /xargo.sh
1414

1515
COPY solaris.sh openssl.sh /
1616
RUN bash /solaris.sh sparcv9 && \
17-
bash /openssl.sh solaris64-sparcv9-gcc sparcv9-sun-solaris2.11-
17+
bash /openssl.sh solaris64-sparcv9-gcc sparcv9-sun-solaris2.10-
1818

19-
ENV CARGO_TARGET_SPARCV9_SUN_SOLARIS_LINKER=sparcv9-sun-solaris2.11-gcc \
20-
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-gcc \
19+
ENV CARGO_TARGET_SPARCV9_SUN_SOLARIS_LINKER=sparcv9-sun-solaris2.10-gcc \
20+
CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.10-gcc \
2121
OPENSSL_DIR=/openssl \
2222
OPENSSL_INCLUDE_DIR=/openssl/include \
2323
OPENSSL_LIB_DIR=/openssl/lib

docker/x86_64-sun-solaris/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ RUN bash /xargo.sh
1414

1515
COPY solaris.sh openssl.sh /
1616
RUN bash /solaris.sh x86_64 && \
17-
bash /openssl.sh solaris64-x86_64-gcc x86_64-sun-solaris2.11-
17+
bash /openssl.sh solaris64-x86_64-gcc x86_64-sun-solaris2.10-
1818

19-
ENV CARGO_TARGET_X86_64_SUN_SOLARIS_LINKER=x86_64-sun-solaris2.11-gcc \
20-
CC_x86_64_sun_solaris=x86_64-sun-solaris2.11-gcc \
19+
ENV CARGO_TARGET_X86_64_SUN_SOLARIS_LINKER=x86_64-sun-solaris2.10-gcc \
20+
CC_x86_64_sun_solaris=x86_64-sun-solaris2.10-gcc \
2121
OPENSSL_DIR=/openssl \
2222
OPENSSL_INCLUDE_DIR=/openssl/include \
2323
OPENSSL_LIB_DIR=/openssl/lib

0 commit comments

Comments
 (0)