diff options
| author | fanquake <fanquake@gmail.com> | 2024-03-08 13:05:47 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-03-08 13:05:47 +0000 |
| commit | 8aff3fd292442c50b61db02527f68f9258263e4a (patch) | |
| tree | 2da13105e10322f46e1885cfbebd10d2e7ffdd3a /depends/builders | |
| parent | 54172c688cbea09ad8baceb712a55cb3e6e3976b (diff) | |
| download | bitcoin-8aff3fd292442c50b61db02527f68f9258263e4a.tar.xz | |
depends: don't use -h with touch on OpenBSD
Should fix #29447.
Diffstat (limited to 'depends/builders')
| -rw-r--r-- | depends/builders/default.mk | 3 | ||||
| -rw-r--r-- | depends/builders/openbsd.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/depends/builders/default.mk b/depends/builders/default.mk index cc6dec66c2..806d6e7c50 100644 --- a/depends/builders/default.mk +++ b/depends/builders/default.mk @@ -5,13 +5,14 @@ default_build_TAR = tar default_build_RANLIB = ranlib default_build_STRIP = strip default_build_NM = nm +default_build_TOUCH = touch -h -m -t 200001011200 define add_build_tool_func build_$(build_os)_$1 ?= $$(default_build_$1) build_$(build_arch)_$(build_os)_$1 ?= $$(build_$(build_os)_$1) build_$1=$$(build_$(build_arch)_$(build_os)_$1) endef -$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL DSYMUTIL,$(eval $(call add_build_tool_func,$(var)))) +$(foreach var,CC CXX AR TAR RANLIB NM STRIP SHA256SUM DOWNLOAD OTOOL INSTALL_NAME_TOOL DSYMUTIL TOUCH,$(eval $(call add_build_tool_func,$(var)))) define add_build_flags_func build_$(build_arch)_$(build_os)_$1 += $(build_$(build_os)_$1) build_$1=$$(build_$(build_arch)_$(build_os)_$1) diff --git a/depends/builders/openbsd.mk b/depends/builders/openbsd.mk index 44825d106a..9c94c4baae 100644 --- a/depends/builders/openbsd.mk +++ b/depends/builders/openbsd.mk @@ -5,3 +5,5 @@ build_openbsd_SHA256SUM = sha256 build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o build_openbsd_TAR = gtar +# openBSD touch doesn't understand -h +build_openbsd_TOUCH = touch -m -t 200001011200 |