diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2023-04-19 17:15:57 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2023-04-19 17:19:51 -0400 |
| commit | 63c0c4ff10b2f6ed8510ef372a5b1f6a6494b179 (patch) | |
| tree | cb4fdc6f715018e054e627bf80567cae892e843f /depends | |
| parent | d26a71a94ac4ae1b1a091f4412d390afba69b2f8 (diff) | |
| download | bitcoin-63c0c4ff10b2f6ed8510ef372a5b1f6a6494b179.tar.xz | |
depends: reuse _config_opts for CMake options
This will allow us to use the existing machinery for filtering by
arch, os, debug/release, etc.
For example, the following becomes possible for libevent:
$(package)_config_opts_release=-DEVENT__DISABLE_DEBUG_MODE
Now the define is only set when not building depends with DEBUG=1
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/funcs.mk | 2 | ||||
| -rw-r--r-- | depends/packages/libmultiprocess.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/depends/funcs.mk b/depends/funcs.mk index f0bbf4a168..987be4e611 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -176,7 +176,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \ CXX="$$($(1)_cxx)" \ CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \ LDFLAGS="$$($(1)_ldflags)" \ - cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" $$($(1)_cmake_opts) + cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" $$($(1)_config_opts) ifeq ($($(1)_type),build) $(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib" else diff --git a/depends/packages/libmultiprocess.mk b/depends/packages/libmultiprocess.mk index 6da5693b3f..765d649377 100644 --- a/depends/packages/libmultiprocess.mk +++ b/depends/packages/libmultiprocess.mk @@ -10,8 +10,8 @@ endif define $(package)_set_vars := ifneq ($(host),$(build)) -$(package)_cmake_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp" -$(package)_cmake_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++" +$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp" +$(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++" endif endef |