diff options
| author | fanquake <fanquake@gmail.com> | 2021-12-27 15:57:15 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-12-27 15:57:45 +0800 |
| commit | a213bd63ca0c96e8c98e84ec916f83c4ba28d486 (patch) | |
| tree | 20e2a365c8d4516cfc6372b88806c64a76645625 /depends | |
| parent | 09ac6c81be9e5f17d1cc908efbb8fdaee5e58fd6 (diff) | |
| parent | d3b0f82a438ae60060d0d4d83245bf75f5de433d (diff) | |
| download | bitcoin-a213bd63ca0c96e8c98e84ec916f83c4ba28d486.tar.xz | |
Merge bitcoin/bitcoin#23817: build: Fix regression introduced in PR23603
d3b0f82a438ae60060d0d4d83245bf75f5de433d build: Fix regression introduced in PR23603 (Hennadii Stepanov)
Pull request description:
It appears 7629efcc2c3a8a8a7c17b1300cd466ec6c8c1f3f from bitcoin/bitcoin#23603 introduced a regression in build tool flag evaluation.
On macOS system:
- pre-PR23603 master (ae017b81604761b57e22c28913c4ce81bf2e31ce):
```
% make -C depends print-darwin_CXXFLAGS
darwin_CXXFLAGS=-pipe
% make -C depends print-host_CXXFLAGS
host_CXXFLAGS=-pipe
```
- the current master (369978686e156ad34df703f1e60bd90aeaa8f2d6):
```
% 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 d3b0f82a438ae60060d0d4d83245bf75f5de433d
Tree-SHA512: 643099ce6858475ac9f3a4dfa72a4e493fec6fdd7042ae0f0d5fe44c5cd175e4eda63cb39fc46ac1501cadcd3466507ec88d9089235e005fe43ea7ab47ce37c1
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/builders/darwin.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index 6e68c88928..ced01229dd 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -22,7 +22,7 @@ darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool) darwin_native_binutils= darwin_native_toolchain= -x86_64_darwin_CFLAGS = -arch x86_64 -x86_64_darwin_CXXFLAGS = $(x86_64_darwin_CFLAGS) -aarch64_darwin_CFLAGS = -arch arm64 -aarch64_darwin_CXXFLAGS = $(aarch64_darwin_CFLAGS) +x86_64_darwin_CFLAGS += -arch x86_64 +x86_64_darwin_CXXFLAGS += -arch x86_64 +aarch64_darwin_CFLAGS += -arch arm64 +aarch64_darwin_CXXFLAGS += -arch arm64 |