build: rely on OS toolchain for aarch64 Darwin builds

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
bytecodealliance · Jul 12, 2023 · e396734 · e396734
1 parent 646043d
commit e396734
Showing 1 changed file with 28 additions and 14 deletions.
diff --git a/flake.nix b/flake.nix
@@ -195,21 +195,35 @@
                 depsBuildBuild
                 ++ optional stdenv.hostPlatform.isDarwin libiconv;
             }
-            // optionalAttrs (craneArgs ? cargoArtifacts) {
-              buildInputs =
-                buildInputs
-                ++ optionals stdenv.hostPlatform.isDarwin [
-                  pkgs.darwin.apple_sdk.frameworks.Security
-                  pkgs.libiconv
-                ];
-
-              # only lock deps in non-dep builds
-              preBuild =
-                preBuild
-                + ''
-                  ${lock.build-test}
+            // optionalAttrs (craneArgs ? cargoArtifacts) ({
+                buildInputs =
+                  buildInputs
+                  ++ optionals stdenv.hostPlatform.isDarwin [
+                    pkgs.darwin.apple_sdk.frameworks.Security
+                    pkgs.libiconv
+                  ];
+
+                # only lock deps in non-dep builds
+                preBuild =
+                  preBuild
+                  + ''
+                    ${lock.build-test}
+                  '';
+              }
+              // optionalAttrs (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) {
+                preConfigure = ''
+                  export SDKROOT=$(xcrun -sdk macosx --show-sdk-path);
+                  export MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version);
                 '';
-            };
+
+                CARGO_TARGET_AARCH64_APPLE_DARWIN_LINKER = "/usr/bin/ld";
+
+                AR_aarch64-apple-darwin = "/usr/bin/ar";
+                CC_aarch64-apple-darwin = "/usr/bin/clang";
+                CXX_aarch64-apple-darwin = "/usr/bin/clang++";
+                LD_aarch64-apple-darwin = "/usr/bin/ld";
+                RANLIB_aarch64-apple-darwin = "/usr/bin/ranlib";
+              });
 
         withChecks = {
           checks,