Auto merge of #3315 - alexcrichton:fix-travis, r=alexcrichton

Really fix OSX nightlies

After #3311 we're now correctly trying to link OpenSSL statically on
OSX. Unfortunately though this is failing to complete on the builders.
Turns out the way we install OpenSSL through Homebrew create "universal
archives" which is essentially an archive with both i686 and x86_64
object files, but separated. The linker takes care of this just fine but
rustc currently chokes on it, unable to include the library statically
into the compiler.

To work around this we prepare our own mini install of OpenSSL by
copying relevant bits into a local directory (like we do on Linux). As
part of this we use the `lipo` tool, which is used to manage these fat
archives, to disassemble the archive and only extract the relevant
architecture. This should make a pre-installation step which both
extracts the information and configures Cargo to use it.

This should also fix the errors we're seeing on Travis I believe.

Makefile.in

@@ -231,17 +231,20 @@ SETARCH_i686-unknown-linux-gnu := setarch i386
 OPENSSL_CFLAGS_i686-unknown-linux-gnu := -m32
 OPENSSL_CFLAGS_i686-unknown-linux-musl := -m32
 
+LIPO_FAMILY_i686-apple-darwin := i386
+LIPO_FAMILY_x86_64-apple-darwin := x86_64
+
 define BUILD_OPENSSL
 
 ifdef CFG_ENABLE_NIGHTLY
+
 cargo-$(1): export OPENSSL_STATIC := 1
 test-unit-$(1): export OPENSSL_STATIC := 1
-endif
 
-ifdef OPENSSL_OS_$(1)
-ifdef CFG_ENABLE_NIGHTLY
 OPENSSL_INSTALL_$(1) := $$(CFG_BUILD_DIR)/target/openssl/$(1)-install
 
+ifdef OPENSSL_OS_$(1)
+
 target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \
 		| target/openssl/
 	mkdir -p target/openssl/$(1)
@@ -261,12 +264,39 @@ test-unit-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
 
 # build libz statically into the cargo we're producing
 cargo-$(1): export LIBZ_SYS_STATIC := 1
-else
+
+else ifdef LIPO_FAMILY_$(1)
+
 target/openssl/$(1).stamp:
+	@echo installing from `brew --prefix openssl`
+	@rm -rf $$(OPENSSL_INSTALL_$(1))
+	mkdir -p $$(OPENSSL_INSTALL_$(1))/lib
+	cp -r `brew --prefix openssl`/include $$(OPENSSL_INSTALL_$(1))/include
+	cp -r `brew --prefix openssl`/lib/pkgconfig $$(OPENSSL_INSTALL_$(1))/lib/pkgconfig
+	lipo -output $$(OPENSSL_INSTALL_$(1))/lib/libssl.a \
+		-extract_family $$(LIPO_FAMILY_$(1)) \
+		`brew --prefix openssl`/lib/libssl.a || \
+		cp `brew --prefix openssl`/lib/libssl.a \
+			$$(OPENSSL_INSTALL_$(1))/lib/libssl.a
+	lipo -output $$(OPENSSL_INSTALL_$(1))/lib/libcrypto.a \
+		-extract_family $$(LIPO_FAMILY_$(1)) \
+		`brew --prefix openssl`/lib/libcrypto.a || \
+		cp `brew --prefix openssl`/lib/libcrypto.a \
+			$$(OPENSSL_INSTALL_$(1))/lib/libcrypto.a
+	touch $$@
+
+cargo-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
+test-unit-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
+
+else # !OPENSSL_OS_$(1) && !OSX
+target/openssl/$(1).stamp:
+
 endif
-else
+
+else # !CFG_ENABLE_NIGHTLY
 target/openssl/$(1).stamp:
 endif
+
 endef
 
 $(foreach target,$(CFG_TARGET),$(eval $(call BUILD_OPENSSL,$(target))))