Skip to content

Commit 9157d9e

Browse files
Sjorsryanofsky
andcommitted
build: use make < 3.82 syntax for define directive
From the GNU make 3.82 release announcement: * The 'define' make directive now allows a variable assignment operator after the variable name, to allow for simple, conditional, or appending multi-line variable assignment. macOS ships with 3.81. This caused the multiprocess config options to be ignored. Fixes bitcoin#32068 Co-authored-by: Ryan Ofsky <[email protected]>
1 parent 698f869 commit 9157d9e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

depends/packages/capnp.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_file_name=$(native_$(package)_file_name)
66
$(package)_sha256_hash=$(native_$(package)_sha256_hash)
77
$(package)_patches=abi_placement_new.patch
88

9-
define $(package)_set_vars :=
9+
define $(package)_set_vars
1010
$(package)_config_opts := -DBUILD_TESTING=OFF
1111
$(package)_config_opts += -DWITH_OPENSSL=OFF
1212
$(package)_config_opts += -DWITH_ZLIB=OFF

depends/packages/libmultiprocess.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ifneq ($(host),$(build))
88
$(package)_dependencies += native_capnp
99
endif
1010

11-
define $(package)_set_vars :=
11+
define $(package)_set_vars
1212
ifneq ($(host),$(build))
1313
$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
1414
$(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"

0 commit comments

Comments
 (0)