[vlc-commits] Contribs: simplify zlib pic

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 29 15:04:04 2016 +0200| [b289b2e3b8d3fd847dea00c2c8f29ea942a04921] | committer: Jean-Baptiste Kempf

Contribs: simplify zlib pic

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

 contrib/src/zlib/rules.mak |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak
index e88ac51..69caa4d 100644
--- a/contrib/src/zlib/rules.mak
+++ b/contrib/src/zlib/rules.mak
@@ -13,10 +13,6 @@ ZLIB_CONFIG_VARS=CHOST=$(HOST)
 endif
 endif
 
-ifdef HAVE_SOLARIS
-ZLIB_ECFLAGS = -fPIC -DPIC
-endif
-
 $(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
 	$(call download,$(ZLIB_URL))
 
@@ -28,10 +24,10 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 
 .zlib: zlib
 ifdef HAVE_WIN32
-	cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc $(HOSTVARS) $(ZLIB_CONFIG_VARS) CFLAGS="$(CFLAGS) $(ZLIB_ECFLAGS)" RC="$(HOST)-windres" LD="$(CC)"
+	cd $< && $(HOSTVARS) $(MAKE) -fwin32/Makefile.gcc $(HOSTVARS) $(ZLIB_CONFIG_VARS) RC="$(HOST)-windres" LD="$(CC)"
 	cd $< && $(MAKE) -fwin32/Makefile.gcc install INCLUDE_PATH="$(PREFIX)/include" LIBRARY_PATH="$(PREFIX)/lib" BINARY_PATH="$(PREFIX)/bin"
 else
-	cd $< && $(HOSTVARS_PIC) $(ZLIB_CONFIG_VARS) CFLAGS="$(CFLAGS) $(ZLIB_ECFLAGS)" ./configure --prefix=$(PREFIX)
+	cd $< && $(HOSTVARS_PIC) $(ZLIB_CONFIG_VARS) ./configure --prefix=$(PREFIX)
 	cd $< && $(MAKE) install
 endif
 	touch $@