diff options
| author | fanquake <fanquake@gmail.com> | 2021-05-31 10:05:04 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-05-31 10:05:55 +0800 |
| commit | 619e930aa1860d92f8eebef3bc1bed8b37c606b8 (patch) | |
| tree | e7bf645d2857427cf3f73577455827d3900d5602 | |
| parent | 55a156fca08713b020aafef91f40df8ce4bc3cae (diff) | |
| parent | 3caedb4c0351f99d1ef74e8fc9d4e276361ce90a (diff) | |
Merge bitcoin/bitcoin#22070: build: don't use cf-protection when targeting arm-apple-darwin
3caedb4c0351f99d1ef74e8fc9d4e276361ce90a build: don't use cf-protection when targeting arm-apple-darwin (fanquake)
Pull request description:
After two reports on IRC of issues building depends on an Apple M1 machine, this option (obviously) can't be used when targeting `arm-apple-darwin`. For now, just use it for `x86_64-apple-darwin`.
```bash
Apple clang version 12.0.5 (clang-1205.0.22.9)
Target: x86_64-apple-darwin20.4.0
error: option 'cf-protection=return' cannot be specified on this target
error: option 'cf-protection=branch' cannot be specified on this target
2 errors generated.
```
ACKs for top commit:
promag:
Tested ACK 3caedb4c0351f99d1ef74e8fc9d4e276361ce90a.
Tree-SHA512: 8763a5b94000016b0c2f0438e66002fdfcd2cbafd9d2d2acc1972f0c6f707e820186711dbd9d3f72673c179718da75588acb4732f8d84b85f0c1dfc862b6e944
| -rw-r--r-- | depends/packages/boost.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 6b3b293140..f879d176f5 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -26,7 +26,7 @@ $(package)_config_libraries=filesystem,system,test $(package)_cxxflags=-std=c++17 -fvisibility=hidden $(package)_cxxflags_linux=-fPIC $(package)_cxxflags_android=-fPIC -$(package)_cxxflags_darwin=-fcf-protection=full +$(package)_cxxflags_x86_64_darwin=-fcf-protection=full endef define $(package)_preprocess_cmds |