Auto merge of #3071 - japaric:moar-cargo, r=alexcrichton

prepare for cargo for mips and powerpc

with these changes I can cross compile Cargo for these targets:

- mips-unknown-linux-gnu
- mipsel-unknown-linux-gnu
- powerpc-unknown-linux-gnu
- powerpc64-unknown-linux-gnu
- powerpc64el-unknown-linux-gnu

using these commands:

```
$ ./.travis.install.deps.sh
$ ./configure --local-rust-root=$(pwd)/rustc --enable-nightly --target=$TARGET
$ make
```

in Ubuntu 16.04 using the standard cross toolchains

r? @alexcrichton
cross compiling Cargo for the mips targets requires rust-lang/libc#378

Author: bors

Makefile.in

@@ -166,37 +166,52 @@ $(DOC_DIR)/%: src/doc/%
 	@mkdir -p $(@D)
 	cp $< $@
 
-OPENSSL_OS_x86_64-unknown-linux-gnu := linux-x86_64
-OPENSSL_OS_x86_64-unknown-linux-musl := linux-x86_64
-OPENSSL_OS_i686-unknown-linux-gnu := linux-elf
+OPENSSL_OS_aarch64-unknown-linux-gnu := linux-aarch64
 OPENSSL_OS_arm-unknown-linux-gnueabi := linux-armv4
 OPENSSL_OS_arm-unknown-linux-gnueabihf := linux-armv4
 OPENSSL_OS_armv7-unknown-linux-gnueabihf := linux-armv4
-OPENSSL_OS_aarch64-unknown-linux-gnu := linux-aarch64
 OPENSSL_OS_i686-unknown-freebsd := BSD-x86-elf
+OPENSSL_OS_i686-unknown-linux-gnu := linux-elf
+OPENSSL_OS_mips-unknown-linux-gnu := linux-mips32
+OPENSSL_OS_mipsel-unknown-linux-gnu := linux-mips32
+OPENSSL_OS_powerpc-unknown-linux-gnu := linux-ppc
+OPENSSL_OS_powerpc64-unknown-linux-gnu := linux-ppc64
+OPENSSL_OS_powerpc64le-unknown-linux-gnu := linux-ppc64le
 OPENSSL_OS_x86_64-unknown-freebsd := BSD-x86_64
+OPENSSL_OS_x86_64-unknown-linux-gnu := linux-x86_64
+OPENSSL_OS_x86_64-unknown-linux-musl := linux-x86_64
 OPENSSL_OS_x86_64-unknown-netbsd := BSD-x86_64
 
-OPENSSL_CC_x86_64-unknown-linux-gnu := gcc
-OPENSSL_CC_x86_64-unknown-linux-musl := musl-gcc
-OPENSSL_CC_i686-unknown-linux-gnu := gcc
-OPENSSL_CC_arm-unknown-linux-gnueabi := arm-linux-gnueabi-gcc
-OPENSSL_CC_arm-unknown-linux-gnueabihf := arm-linux-gnueabihf-gcc
-OPENSSL_CC_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-gcc
-OPENSSL_CC_aarch64-unknown-linux-gnu := aarch64-linux-gnu-gcc
-OPENSSL_CC_i686-unknown-freebsd := i686-unknown-freebsd10-gcc
-OPENSSL_CC_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-gcc
-OPENSSL_CC_x86_64-unknown-netbsd := x86_64-unknown-netbsd-gcc
-OPENSSL_AR_x86_64-unknown-linux-gnu := ar
-OPENSSL_AR_x86_64-unknown-linux-musl := ar
-OPENSSL_AR_i686-unknown-linux-gnu := ar
+OPENSSL_AR_aarch64-unknown-linux-gnu := aarch64-linux-gnu-ar
 OPENSSL_AR_arm-unknown-linux-gnueabi := arm-linux-gnueabi-ar
 OPENSSL_AR_arm-unknown-linux-gnueabihf := arm-linux-gnueabihf-ar
 OPENSSL_AR_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-ar
-OPENSSL_AR_aarch64-unknown-linux-gnu := aarch64-linux-gnu-ar
 OPENSSL_AR_i686-unknown-freebsd := i686-unknown-freebsd10-ar
+OPENSSL_AR_i686-unknown-linux-gnu := ar
+OPENSSL_AR_mips-unknown-linux-gnu := mips-linux-gnu-ar
+OPENSSL_AR_mipsel-unknown-linux-gnu := mipsel-linux-gnu-ar
+OPENSSL_AR_powerpc-unknown-linux-gnu := powerpc-linux-gnu-ar
+OPENSSL_AR_powerpc64-unknown-linux-gnu := powerpc64-linux-gnu-ar
+OPENSSL_AR_powerpc64le-unknown-linux-gnu := powerpc64le-linux-gnu-ar
 OPENSSL_AR_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-ar
+OPENSSL_AR_x86_64-unknown-linux-gnu := ar
+OPENSSL_AR_x86_64-unknown-linux-musl := ar
 OPENSSL_AR_x86_64-unknown-netbsd := x86_64-unknown-netbsd-ar
+OPENSSL_CC_aarch64-unknown-linux-gnu := aarch64-linux-gnu-gcc
+OPENSSL_CC_arm-unknown-linux-gnueabi := arm-linux-gnueabi-gcc
+OPENSSL_CC_arm-unknown-linux-gnueabihf := arm-linux-gnueabihf-gcc
+OPENSSL_CC_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-gcc
+OPENSSL_CC_i686-unknown-freebsd := i686-unknown-freebsd10-gcc
+OPENSSL_CC_i686-unknown-linux-gnu := gcc
+OPENSSL_CC_mips-unknown-linux-gnu := mips-linux-gnu-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
+OPENSSL_CC_powerpc64le-unknown-linux-gnu := powerpc64le-linux-gnu-gcc
+OPENSSL_CC_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-gcc
+OPENSSL_CC_x86_64-unknown-linux-gnu := gcc
+OPENSSL_CC_x86_64-unknown-linux-musl := musl-gcc
+OPENSSL_CC_x86_64-unknown-netbsd := x86_64-unknown-netbsd-gcc
 
 SETARCH_i686-unknown-linux-gnu := setarch i386
 OPENSSL_CFLAGS_i686-unknown-linux-gnu := -m32

src/etc/install-deps.py

@@ -17,15 +17,20 @@
 if sys.platform == 'linux' or sys.platform == 'linux2':
     host = host_bits + '-unknown-linux-gnu'
     targets = [
-        'i686-unknown-linux-gnu',
-        'x86_64-unknown-linux-gnu',
-        'x86_64-unknown-linux-musl',
+        'aarch64-unknown-linux-gnu',
         'arm-unknown-linux-gnueabi',
         'arm-unknown-linux-gnueabihf',
         'armv7-unknown-linux-gnueabihf',
-        'aarch64-unknown-linux-gnu',
         'i686-unknown-freebsd',
+        'i686-unknown-linux-gnu',
+        'mips-unknown-linux-gnu',
+        'mipsel-unknown-linux-gnu',
+        'powerpc-unknown-linux-gnu',
+        'powerpc64-unknown-linux-gnu',
+        'powerpc64le-unknown-linux-gnu',
         'x86_64-unknown-freebsd',
+        'x86_64-unknown-linux-gnu',
+        'x86_64-unknown-linux-musl',
         'x86_64-unknown-netbsd',
     ]
 elif sys.platform == 'darwin':