From e47f818f7c6b75993bad06d8b69861ab410a4738 Mon Sep 17 00:00:00 2001 From: Mindaugas Rukas <3825716+mindaugasrukas@users.noreply.github.com> Date: Thu, 16 Jun 2022 04:07:37 -0700 Subject: [PATCH] Fix OpenSSL building on Apple Silicon M1 (ARM) (#1032) 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 --- build/fbcode_builder/getdeps/builder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build/fbcode_builder/getdeps/builder.py b/build/fbcode_builder/getdeps/builder.py index 09fdeb193..2820b24b3 100644 --- a/build/fbcode_builder/getdeps/builder.py +++ b/build/fbcode_builder/getdeps/builder.py @@ -990,7 +990,11 @@ class OpenSSLBuilder(BuilderBase): elif self.build_opts.is_darwin(): make = "make" 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(): make = "make" make_j_args = ["-j%s" % self.num_jobs]