diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-26 15:33:26 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-26 17:33:30 +0200 |
| commit | cb2762360fc6edb6afe52759550979ce5068b9b0 (patch) | |
| tree | 1c54a88a91458f94cdde87a70312021f235643b6 /RepositoryExternal.mk | |
| parent | b4b5376afc9d8bb9299ed267db2c4177e4b10969 (diff) | |
gbuildify zlib
Change-Id: I702c044fdf510c67364f2fc32889ca394583edf6
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 83d90ad5701e..e08beecc9e4d 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -167,23 +167,46 @@ $(call gb_LinkTarget_add_libs,$(1),-lz) endef +# nothing on system +define gb_LinkTarget__use_zlib_x64 + +endef + else # !SYSTEM_ZLIB $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ zlib \ + zlib_x64 \ )) -define gb_LinkTarget__use_zlib +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 \ $$(INCLUDE) \ ) + $(call gb_LinkTarget_use_static_libraries,$(1),\ - zlib \ + $(2) \ ) endef +define gb_LinkTarget__use_zlib +$(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib) + +endef + +define gb_LinkTarget__use_zlib_x64 +$(call gb_LinkTarget__use_zlib_multiarch,$(1),zlib_x64) + +endef + endif # SYSTEM_ZLIB |