diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-25 13:02:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:37:34 +0200 |
| commit | abc873feb3c805fd1f7c0a4b9b4a236617ec9ff7 (patch) | |
| tree | 01e78a4a3feac5070eb13089dfc80c5577db0a6d /RepositoryExternal.mk | |
| parent | 2ffde7b17192f76f815ab451f08164519f69887e (diff) | |
expat: for 64bit 1 static library is enough, only utf16 variant used
Change-Id: I98a3428578b52c6d9d7210a8fb0211876d6f7cae
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 5847c4672ee1..f6f32140bb64 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -237,8 +237,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ascii_expat_xmlparse \ expat_xmlparse \ expat_xmltok \ - expat_xmlparse_x64 \ - expat_xmltok_x64 \ + expat_x64 \ )) define gb_LinkTarget__use_expat @@ -256,7 +255,6 @@ $(if $(filter-out ascii_expat_xmlparse,$(2)),\ $(call gb_LinkTarget_use_static_libraries,$(1),\ $(2) \ - $(3)\ ) endef @@ -265,17 +263,17 @@ endif # SYSTEM_EXPAT # now define 2 wrappers that select which internal static library to use... define gb_LinkTarget__use_expat_utf8 -$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse,expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse expat_xmltok) endef define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse,expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse expat_xmltok) endef define gb_LinkTarget__use_expat_utf16_x64 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse_x64,expat_xmltok_x64) +$(call gb_LinkTarget__use_expat,$(1),expat_x64) endef |