From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 15 Dec 2016 16:59:51 +0000 (-0800)
Subject: Minor build tweaks
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~76^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=46fff01340f2ff149d1b4a4861f24c47eb7f1840;p=cargo.git

Minor build tweaks

* Clean out OpenSSL when building
* Test 32-bit Cargo on OSX, not the 64-bit version on the 32-bit builder
---

diff --git a/.travis.yml b/.travis.yml
index ed4d0e289..501f2d1b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,7 +29,7 @@ matrix:
            MACOSX_DEPLOYMENT_TARGET=10.7
       os: osx
     - env: TARGET=i686-apple-darwin
-           MAKE_TARGETS=test
+           MAKE_TARGETS=test-unit-i686-apple-darwin
            MACOSX_DEPLOYMENT_TARGET=10.7
            CFG_DISABLE_CROSS_TESTS=1
       os: osx
diff --git a/Makefile.in b/Makefile.in
index 89e3f2a31..9f9dd8e50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -259,6 +259,7 @@ ifdef OPENSSL_OS_$(1)
 
 target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \
 		| target/openssl/
+	rm -rf target/openssl/$(1)
 	mkdir -p target/openssl/$(1)
 	tar xf $$< -C target/openssl/$(1) --strip-components 1
 	(cd target/openssl/$(1) && \