[vlc-commits] contrib: zlib: Set the CHOST variable

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Tue Apr  2 12:44:41 2013 +0300| [023049e340f61c394cff0c1b568a46b93fbf525e] | committer: Rafaël Carré

contrib: zlib: Set the CHOST variable

This fixes cross compilation from OS X.

Modified-by: Rafaël Carré <funman at videolan.org>
Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=023049e340f61c394cff0c1b568a46b93fbf525e
---

 contrib/src/zlib/rules.mak |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index 4e07918..0e6ef20 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -7,6 +7,12 @@ ifeq ($(call need_pkg,"zlib"),)
 PKGS_FOUND += zlib
 endif
 
+ifeq ($(shell uname),Darwin) # zlib tries to use libtool on Darwin
+ifdef HAVE_CROSS_COMPILE
+ZLIB_CONFIG_VARS=CHOST=$(HOST)
+endif
+endif
+
 $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 	$(call download,$(ZLIB_URL))
 
@@ -18,6 +24,6 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 	$(MOVE)
 
 .zlib: zlib
-	cd $< && $(HOSTVARS) ./configure --prefix=$(PREFIX) --static
+	cd $< && $(HOSTVARS) $(ZLIB_CONFIG_VARS) ./configure --prefix=$(PREFIX) --static
 	cd $< && $(MAKE) install
 	touch $@