Skip to content

Commit 927e9b2

Browse files
committed
Merge bitcoin/bitcoin#32716: depends: Override host compilers for FreeBSD and OpenBSD
4f10a57 depends: Override host compilers for FreeBSD and OpenBSD (Hennadii Stepanov) Pull request description: When building depends on FreeBSD/OpenBSD `aarch64`, the host compilers default to `default_host_{CC,CXX}`, which resolves to `gcc`/`g++`. This is incorrect on these systems, where Clang is the default system compiler. To ensure proper compiler selection, this PR adopts the same approach used for `darwin`:https://github.com/bitcoin/bitcoin/blob/c1d4253d316ea627f46b26e395d7b48842258381/depends/builders/darwin.mk#L12-L14 Fixes bitcoin/bitcoin#32691. ACKs for top commit: Sjors: ACK 4f10a57 Tree-SHA512: 66ace60b63671f2ab7facb84776298e1489aa0a984559c9a22323adaaedcc86f67158078b18c333cb7bdc2b17a4573e321ee7361596bc941db060c5659014069
2 parents c7fe8ab + 4f10a57 commit 927e9b2

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

depends/builders/freebsd.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,7 @@ build_freebsd_CXX=clang++
33

44
build_freebsd_SHA256SUM = sha256sum
55
build_freebsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
6+
7+
# freebsd host on freebsd builder: override freebsd host preferences.
8+
freebsd_CC = clang
9+
freebsd_CXX = clang++

depends/builders/openbsd.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CON
77
build_openbsd_TAR = gtar
88
# openBSD touch doesn't understand -h
99
build_openbsd_TOUCH = touch -m -t 200001011200
10+
11+
# openbsd host on openbsd builder: override openbsd host preferences.
12+
openbsd_CC = clang
13+
openbsd_CXX = clang++

0 commit comments

Comments
 (0)