Skip to content

Commit

Permalink
Auto merge of rust-lang#3648 - cuviper:powerpc64-gcc4, r=alexcrichton
Browse files Browse the repository at this point in the history 
Update OPENSSL_CC_powerpc64-unknown-linux-gnu

With the new `rust-slave-linux-cross:2017-02-02`, powerpc64 no longer
uses gcc-5.  I updated the `Dockerfile` at the time to reflect this, but
missed `OPENSSL_CC_powerpc64-unknown-linux-gnu` in `Makefile.in`.
  • Loading branch information
@bors
bors committed Feb 4, 2017
2 parents ad92930 + d5ba122 commit d710222
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ OPENSSL_CC_mips64-unknown-linux-gnuabi64 := mips64-linux-gnuabi64-gcc
OPENSSL_CC_mips64el-unknown-linux-gnuabi64 := mips64el-linux-gnuabi64-gcc
OPENSSL_CC_mipsel-unknown-linux-gnu := mipsel-linux-gnu-gcc
OPENSSL_CC_powerpc-unknown-linux-gnu := powerpc-linux-gnu-gcc
OPENSSL_CC_powerpc64-unknown-linux-gnu := powerpc64-linux-gnu-gcc-5
OPENSSL_CC_powerpc64-unknown-linux-gnu := powerpc64-linux-gnu-gcc
OPENSSL_CC_powerpc64le-unknown-linux-gnu := powerpc64le-linux-gnu-gcc
OPENSSL_CC_s390x-unknown-linux-gnu := s390x-linux-gnu-gcc
OPENSSL_CC_x86_64-apple-darwin := clang
Expand Down

0 comments on commit d710222

Please sign in to comment.