diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 15:47:24 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 23:34:26 +0200 |
commit | 3c38b7727a3deab37c5e9b822cec53c081e2b6e3 (patch) | |
tree | 61b40e23ba463a235d7bc41028630a068f3c4fe2 /RepositoryExternal.mk | |
parent | e567baf92c0fc71e862a2cf07e029576ee36cd77 (diff) |
zlib: remove ExternalPackage_zlib
Change-Id: I5bce88b2044279a6563fd68c35f9c1ac824c8850
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f636d7bedcc9..2a58722b450d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -343,12 +343,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ define gb_LinkTarget__use_zlib_multiarch $(if $(2),,$(call gb_Output_error,gb_LinkTarget__use_zlib_multiarch needs two arguments)) -$(call gb_LinkTarget_use_packages,$(1),\ - zlib_inc \ -) - $(call gb_LinkTarget_set_include,$(1),\ - -I$(OUTDIR)/inc/external/zlib \ + $(ZLIB_CFLAGS) \ $$(INCLUDE) \ ) @@ -369,7 +365,6 @@ $(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64) endef define gb_ExternalProject__use_zlib -$(call gb_ExternalProject_use_package,$(1),zlib_inc) $(call gb_ExternalProject_use_static_libraries,$(1),zlib) endef |