Skip to content

Commit a213bd6

Browse files
committed
Merge bitcoin#23817: build: Fix regression introduced in PR23603
d3b0f82 build: Fix regression introduced in PR23603 (Hennadii Stepanov) Pull request description: It appears 7629efc from bitcoin#23603 introduced a regression in build tool flag evaluation. On macOS system: - pre-PR23603 master (ae017b8): ``` % make -C depends print-darwin_CXXFLAGS darwin_CXXFLAGS=-pipe % make -C depends print-host_CXXFLAGS host_CXXFLAGS=-pipe ``` - the current master (3699786): ``` % make -C depends print-darwin_CXXFLAGS darwin_CXXFLAGS=-pipe % make -C depends print-host_CXXFLAGS host_CXXFLAGS=-arch x86_64 ``` It's obvious a flag being set in `depends/hosts/darwin.mk`, i.e., `-pipe`, is lost. With this PR: ``` % make -C depends print-darwin_CXXFLAGS darwin_CXXFLAGS=-pipe % make -C depends print-host_CXXFLAGS host_CXXFLAGS=-pipe -arch x86_64 ``` ACKs for top commit: fanquake: ACK d3b0f82 Tree-SHA512: 643099ce6858475ac9f3a4dfa72a4e493fec6fdd7042ae0f0d5fe44c5cd175e4eda63cb39fc46ac1501cadcd3466507ec88d9089235e005fe43ea7ab47ce37c1
2 parents 09ac6c8 + d3b0f82 commit a213bd6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

depends/builders/darwin.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
2222
darwin_native_binutils=
2323
darwin_native_toolchain=
2424

25-
x86_64_darwin_CFLAGS = -arch x86_64
26-
x86_64_darwin_CXXFLAGS = $(x86_64_darwin_CFLAGS)
27-
aarch64_darwin_CFLAGS = -arch arm64
28-
aarch64_darwin_CXXFLAGS = $(aarch64_darwin_CFLAGS)
25+
x86_64_darwin_CFLAGS += -arch x86_64
26+
x86_64_darwin_CXXFLAGS += -arch x86_64
27+
aarch64_darwin_CFLAGS += -arch arm64
28+
aarch64_darwin_CXXFLAGS += -arch arm64

0 commit comments

Comments
 (0)