Skip to content

Commit 9c5cdf0

Browse files
committed
Merge bitcoin/bitcoin#30287: macOS: rewrite some docs & swap mmacosx-version-min for mmacos-version-min
7c298fe doc: rewrite some of the macdeploy docs (fanquake) d042230 depends: swap mmacosx-version-min for mmacos-version-min (fanquake) Pull request description: Whilst `-mmacosx-version-min` and `-mmacos-version-min` remain aliases for each other, the later is preferred, and I assume the former will be removed at some point in the future; see: llvm/llvm-project#95374. Somewhat of a followup to #21778. Rewrite some of the mac deploy docs. ACKs for top commit: theuni: utACK 7c298fe TheCharlatan: ACK 7c298fe hebasto: ACK 7c298fe. Tree-SHA512: 6493f087fde93e0eec319af0e105d163b3f047d8a03f7d4b0d6cd7c64b58d0a978b7d67c6b8dba5c6ccf8b10e188aab5dc98eec400b0546dc9ee801a689b4332
2 parents 5fbdfe7 + 7c298fe commit 9c5cdf0

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

contrib/macdeploy/README.md

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,30 +56,22 @@ The `sha256sum` should be `c0c2e7bb92c1fee0c4e9f3a485e4530786732d6c6dd9e9f418c28
5656

5757
## Deterministic macOS App Notes
5858

59-
macOS Applications are created in Linux using a recent LLVM.
59+
macOS Applications are created on Linux using a recent LLVM.
6060

61-
Apple uses `clang` extensively for development and has upstreamed the necessary
62-
functionality so that a vanilla clang can take advantage. It supports the use of `-F`,
63-
`-target`, `-mmacosx-version-min`, and `-isysroot`, which are all necessary when
64-
building for macOS.
61+
All builds must target an Apple SDK. These SDKs are free to download, but not redistributable.
62+
See the SDK Extraction notes above for how to obtain it.
6563

66-
To complicate things further, all builds must target an Apple SDK. These SDKs are free to
67-
download, but not redistributable. See the SDK Extraction notes above for how to obtain it.
64+
The Guix build process has been designed to avoid including the SDK's files in Guix's outputs.
65+
All interim tarballs are fully deterministic and may be freely redistributed.
6866

69-
The Guix process builds 2 sets of files: Linux tools, then Apple binaries which are
70-
created using these tools. The build process has been designed to avoid including the
71-
SDK's files in Guix's outputs. All interim tarballs are fully deterministic and may be freely
72-
redistributed.
73-
74-
As of OS X 10.9 Mavericks, using an Apple-blessed key to sign binaries is a requirement in
75-
order to satisfy the new Gatekeeper requirements. Because this private key cannot be
76-
shared, we'll have to be a bit creative in order for the build process to remain somewhat
77-
deterministic. Here's how it works:
67+
Using an Apple-blessed key to sign binaries is a requirement to produce (distributable) macOS
68+
binaries. Because this private key cannot be shared, we'll have to be a bit creative in order
69+
for the build process to remain somewhat deterministic. Here's how it works:
7870

7971
- Builders use Guix to create an unsigned release. This outputs an unsigned ZIP which
80-
users may choose to bless and run. It also outputs an unsigned app structure in the form
81-
of a tarball.
72+
users may choose to bless, self-codesign, and run. It also outputs an unsigned app structure
73+
in the form of a tarball.
8274
- The Apple keyholder uses this unsigned app to create a detached signature, using the
83-
script that is also included there. Detached signatures are available from this [repository](https://github.com/bitcoin-core/bitcoin-detached-sigs).
84-
- Builders feed the unsigned app + detached signature back into Guix. It uses the
85-
pre-built tools to recombine the pieces into a deterministic ZIP.
75+
included script. Detached signatures are available from this [repository](https://github.com/bitcoin-core/bitcoin-detached-sigs).
76+
- Builders feed the unsigned app + detached signature back into Guix, which combines the
77+
pieces into a deterministic ZIP.

depends/hosts/darwin.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
6565
-iwithsysroot/usr/include/c++/v1 \
6666
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
6767

68-
darwin_CFLAGS=-pipe -std=$(C_STANDARD) -mmacosx-version-min=$(OSX_MIN_VERSION)
69-
darwin_CXXFLAGS=-pipe -std=$(CXX_STANDARD) -mmacosx-version-min=$(OSX_MIN_VERSION)
68+
darwin_CFLAGS=-pipe -std=$(C_STANDARD) -mmacos-version-min=$(OSX_MIN_VERSION)
69+
darwin_CXXFLAGS=-pipe -std=$(CXX_STANDARD) -mmacos-version-min=$(OSX_MIN_VERSION)
7070
darwin_LDFLAGS=-Wl,-platform_version,macos,$(OSX_MIN_VERSION),$(OSX_SDK_VERSION)
7171

7272
ifneq ($(build_os),darwin)

0 commit comments

Comments
 (0)