lib/proxygen
1
0
Fork 0
mirror of https://github.com/facebook/proxygen.git synced 2025-08-08 18:02:05 +03:00
Code Activity

Fix OpenSSL building on Apple Silicon M1 (ARM) (#1032)

Browse Source 
Summary:
Before the change:
```
% uname -m -s
Darwin arm64

% ./autogen.sh
...
ld: warning: ignoring file /private/var/.../installed/openssl-OovnrH2WrHG18y7xi0irAegZLOlNsDyeOGb8BBEcoGw/lib/libssl.dylib, building for macOS-arm64 but attempting to link with file built for macOS-x86_64
ld: warning: ignoring file /private/var/.../installed/openssl-OovnrH2WrHG18y7xi0irAegZLOlNsDyeOGb8BBEcoGw/lib/libcrypto.dylib, building for macOS-arm64 but attempting to link with file built for macOS-x86_64
...
```

After the change build succeeds.

X-link: https://github.com/facebook/watchman/pull/1032

Reviewed By: fanzeyi

Differential Revision: D37137060

Pulled By: genevievehelsel

fbshipit-source-id: a8381c39821bbd29ddea1d1009b94f5ed6cacb21
This commit is contained in:
Mindaugas Rukas
2022-06-16 04:07:37 -07:00
committed by Facebook GitHub Bot
parent 12d01a3f76
commit e47f818f7c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/fbcode_builder/getdeps/builder.py
View File

@@ -990,7 +990,11 @@ class OpenSSLBuilder(BuilderBase):
elif self.build_opts.is_darwin(): elif self.build_opts.is_darwin():
make = "make" make = "make"
make_j_args = ["-j%s" % self.num_jobs] make_j_args = ["-j%s" % self.num_jobs]
args = ["darwin64-x86_64-cc"] args = (
["darwin64-x86_64-cc"]
if not self.build_opts.is_arm()
else ["darwin64-arm64-cc"]
)
elif self.build_opts.is_linux(): elif self.build_opts.is_linux():
make = "make" make = "make"
make_j_args = ["-j%s" % self.num_jobs] make_j_args = ["-j%s" % self.num_jobs]