build: use -isysroot over --sysroot on macOS
ClosedPublic
Actions

Authored by PiRK on Apr 26 2023, 14:14.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABC36e36b3ccae1: build: use -isysroot over --sysroot on macOS

Summary

Not only does this seem to be the more correct behaviour when targeting Darwin, but if you use -isysroot, Clangs Darwin driver will infer the deployment target from the SDK and use other SDK info when parsing arguments to the linker. In the case of -platform_version, which is added if the linker is new enough, the version tuple is constructed from the SDKInfo, and SDKInfo, as far as I can tell, only exists when -isysroot has been passed, see parseSDKSettings

As a result, the SDK version field in the LC_BUILD_VERSION command is filled out.

This, from what I understand, will fix the issue we are having with Qt deciding wether or not to enable features like "Dark mode" on macOS

This is a backport of core#21793

Test Plan

CI osx builds

Diff Detail

Repository

rABC Bitcoin ABC

Branch

pr21793

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 23492
Build 46603: Build Diff
Build 46602: arc lint + arc unit

Event Timeline

PiRK created this revision.Apr 26 2023, 14:14

Herald added a reviewer: Restricted Project. · View Herald TranscriptApr 26 2023, 14:14

PiRK requested review of this revision.Apr 26 2023, 14:14

teamcity edited the summary of this revision. (Show Details)Apr 26 2023, 14:14

Harbormaster completed remote builds in B23479: Diff 39973.Apr 26 2023, 14:14

@bot build-osx gitian-osx

teamcity awarded a token.Apr 26 2023, 14:15

@bot gitian-osx

teamcity updated a token.Apr 26 2023, 15:31

rebase onto D13789 to hopefully achieve determinism

Harbormaster completed remote builds in B23492: Diff 39987.Apr 26 2023, 16:03

@bot gitian-osx

teamcity updated a token.Apr 26 2023, 16:04

@bot gitian-osx

teamcity updated a token.Apr 26 2023, 18:29

Generating report
b934493c690f7c31137091ce8348b2a7fd50455ee60ad6debb779ba023f55ae4  bitcoin-abc-0.27.4-osx-unsigned.dmg
414bcd57949200019fd2c7c1bd65bb589db4467686ab157aaa3c49a1581c607b  bitcoin-abc-0.27.4-osx-unsigned.tar.gz
1d50b46dc83cbf7c0f4b908fbf32d2d1cec6a6a86785595d97fa3a66d0453da6  bitcoin-abc-0.27.4-osx64.tar.gz
9b228e3b24d0da678efb572a92b6efaa69320cee94f88fbc04926518933e05ef  src/bitcoin-abc-0.27.4.tar.gz
1aaa8e870910aa9ae652e817ca382ca970418d522e0fae354522a5905fb5979f  bitcoin-abc-osx-res.yml
Done.

Generating report
b934493c690f7c31137091ce8348b2a7fd50455ee60ad6debb779ba023f55ae4  bitcoin-abc-0.27.4-osx-unsigned.dmg
414bcd57949200019fd2c7c1bd65bb589db4467686ab157aaa3c49a1581c607b  bitcoin-abc-0.27.4-osx-unsigned.tar.gz
1d50b46dc83cbf7c0f4b908fbf32d2d1cec6a6a86785595d97fa3a66d0453da6  bitcoin-abc-0.27.4-osx64.tar.gz
9b228e3b24d0da678efb572a92b6efaa69320cee94f88fbc04926518933e05ef  src/bitcoin-abc-0.27.4.tar.gz
c338aa9aea2f6290730659dd86773e21b34082ba48af43665d9b793a86d9a54f  bitcoin-abc-osx-res.yml

@bot gitian-osx

teamcity updated a token.Apr 27 2023, 06:25