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 /boost/StaticLibrary_boostthread.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 'boost/StaticLibrary_boostthread.mk')
-rw-r--r-- | boost/StaticLibrary_boostthread.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk index 9a00cd96c5ff..3aa4859cbcbe 100644 --- a/boost/StaticLibrary_boostthread.mk +++ b/boost/StaticLibrary_boostthread.mk @@ -10,7 +10,12 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,boostthread)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostthread)) - + +# disable "auto link" "feature" on MSVC +$(eval $(call gb_StaticLibrary_add_defs,boostthread,\ + -DBOOST_ALL_NO_LIB \ +)) + $(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost)) $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp)) |