From 028069d767cca4ef0b8a469289e30f1aecacd945 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 7 Nov 2024 22:23:22 -0800 Subject: [PATCH] darwin: remove -arch from cc/ld wrapper `-arch` in the cc/ld wrapper causes problems when specifying different `--target` options, which would succeed except for the conflicting `-arch` specifier. Reverts fc0456bed1372ccff51fc6fd578e5d2a09d64534 and b26e0bac8dab068e54b0c8ee1bf8fd5fe5683b39 --- pkgs/build-support/bintools-wrapper/default.nix | 4 ---- pkgs/build-support/cc-wrapper/default.nix | 4 ---- 2 files changed, 8 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 736494b5ee55..1d907aa31f48 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -343,10 +343,6 @@ stdenvNoCC.mkDerivation { done '' - + optionalString targetPlatform.isDarwin '' - echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags - '' - ## ## GNU specific extra strip flags ## diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6caf5103325a..d9174df31a2a 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -696,10 +696,6 @@ stdenvNoCC.mkDerivation { done '' - + optionalString targetPlatform.isDarwin '' - echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags - '' - + optionalString targetPlatform.isAndroid '' echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags ''