diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-09-06 20:22:11 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-09-10 20:24:43 +0200 |
| commit | 7f2e168421c3cd928a31a52a8b5afe97e931d3ba (patch) | |
| tree | ea3c0dcce467f18b921b266e3cbd21e57b0da1a7 /RepositoryExternal.mk | |
| parent | d73fc13af4fccb098928d1646ad843d92505562e (diff) | |
boost, orcus: disable bizarre "auto link" feature for MSVC:
Boost apparently uses a MSVC auto-link feature to cause MSVC to request
a static library with a very particular name; disable this and remove
the associated ugly workarounds boost/Package_boost*.mk.
(Another alternative better than Package_boost*.mk would be to
just mangle the static library name in RepositoryFixes.mk)
Change-Id: Iea91f9978da00d89d2a696f3cdd090a85cea8e64
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 82c6b173bc48..4389a545c608 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -336,9 +336,24 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ boostthread \ )) -endif + +define gb_LinkTarget__use_boostthread +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + +$(call gb_LinkTarget_use_static_libraries,$(1),\ + boostthread \ +) +endef + +endif # WNT define gb_LinkTarget__use_boostdatetime +$(call gb_LinkTarget_add_defs,$(1),\ + -DBOOST_ALL_NO_LIB \ +) + $(call gb_LinkTarget_use_static_libraries,$(1),\ boostdatetime \ ) |