diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-06 15:10:19 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-09-07 09:10:39 -0400 |
| commit | 0454b737d3cb33f47d2aef899ee1d22a2bf60412 (patch) | |
| tree | 2be1fcc9572f4cadf44d3774b05df94089283205 | |
| parent | af4630416a33659e9d1257cea27cdae1b9a354d9 (diff) | |
Make boostthread windows only for now.
Not sure if unix needs it since most folks build with system boost
there.
Change-Id: I49d02a682e6658f6e3c5a6ada480903567d8c436
| -rw-r--r-- | RepositoryExternal.mk | 5 | ||||
| -rw-r--r-- | boost/Module_boost.mk | 10 |
2 files changed, 14 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 9aa0188c7420..c99e4ea1a13f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -326,8 +326,13 @@ else # !SYSTEM_BOOST $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ boostdatetime \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ boostthread \ )) +endif define gb_LinkTarget__use_boostdatetime $(call gb_LinkTarget_use_static_libraries,$(1),\ diff --git a/boost/Module_boost.mk b/boost/Module_boost.mk index cca44eacf99e..bb5116321f84 100644 --- a/boost/Module_boost.mk +++ b/boost/Module_boost.mk @@ -13,7 +13,15 @@ ifeq ($(SYSTEM_BOOST),NO) $(eval $(call gb_Module_add_targets,boost,\ StaticLibrary_boostdatetime \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,boost,\ StaticLibrary_boostthread \ +)) +endif + +$(eval $(call gb_Module_add_targets,boost,\ UnpackedTarball_boost \ )) @@ -24,6 +32,6 @@ $(eval $(call gb_Module_add_targets,boost,\ )) endif -endif +endif # SYSTEM_BOOST # vim: set noet sw=4 ts=4: |