diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-23 17:03:09 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-09-25 14:56:26 -0400 |
| commit | 3b63df5fac7c65c87036aec2bdf8130b74873577 (patch) | |
| tree | e909de6e2969a28e947d7948fdcf0d2e9876ad5b /depends | |
| parent | 7e99df78c4e9f93f2f31298c00bb5568bfd42a43 (diff) | |
| download | bitcoin-3b63df5fac7c65c87036aec2bdf8130b74873577.tar.xz | |
depends: boost: build for debug or release as requested
Also hook up cppflags there, which was missing before.
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/packages/boost.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index a3cacbcbb6..98ed3de772 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -6,8 +6,10 @@ $(package)_sha256_hash=fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7 $(package)_patches=darwin_boost_atomic-1.patch darwin_boost_atomic-2.patch define $(package)_set_vars +$(package)_config_opts_release=variant=release +$(package)_config_opts_debug=variant=debug $(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam -$(package)_config_opts+=variant=release threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 +$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 $(package)_config_opts_linux=threadapi=pthread runtime-link=shared $(package)_config_opts_darwin=--toolset=darwin-4.2.1 runtime-link=shared $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static @@ -26,7 +28,7 @@ endef define $(package)_preprocess_cmds patch -p2 < $($(package)_patch_dir)/darwin_boost_atomic-1.patch && \ patch -p2 < $($(package)_patch_dir)/darwin_boost_atomic-2.patch && \ - echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam + echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam endef define $(package)_config_cmds |