Commit 8d69f6a
folly manifest: promote openssl to universal dep + force Apple ar/ranlib on darwin
Summary:
Two unrelated cleanups to the folly manifest.
1. Promote openssl from per-OS `[dependencies.os=*]` entries to the universal `[dependencies]` block. folly uses OpenSSL on every supported platform: openssl's manifest is `builder=nop` on linux/freebsd (resolves via the distro's openssl-devel package) and builds from source on darwin/windows. Listing it once at the top is simpler and lets `install-system-deps --recursive` pick it up uniformly. This also removes a stale comment claiming the manifest format can't express "system dep is sufficient" -- that capability now exists via the `nop` builder + `[debs]`/`[rpms]` declarations in the openssl manifest.
2. Force `CMAKE_AR=/usr/bin/ar` and `CMAKE_RANLIB=/usr/bin/ranlib` on darwin. When folly is built with Homebrew LLVM clang on macOS (used by the wheels CI to pick up C++23 features that AppleClang doesn't have), CMake otherwise picks up Homebrew's llvm-ar, which writes BSD-style archives with a "/" symbol-table member that Apple's classic linker cannot parse for empty archives. Several folly portability libraries have no source files on darwin and produce exactly such empty archives, which then fail to link. Apple's tools always emit archives the system linker accepts, and AppleClang already uses /usr/bin/ar by default, so this is a no-op for AppleClang folly users.
Reviewed By: bigfootjon
Differential Revision: D104428959
fbshipit-source-id: 3390a631e533c34095f5db8ebb1fdd5ccc2f5ebb1 parent 9445346 commit 8d69f6a
1 file changed
Lines changed: 16 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
26 | 27 | | |
27 | 28 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | 29 | | |
41 | | - | |
42 | | - | |
| 30 | + | |
43 | 31 | | |
44 | | - | |
45 | 32 | | |
46 | 33 | | |
47 | 34 | | |
| |||
71 | 58 | | |
72 | 59 | | |
73 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
74 | 75 | | |
75 | 76 | | |
76 | 77 | | |
| |||
0 commit comments