diff options
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 16 | ||||
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 1 |
2 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 2bca1bcc1d7..864fdca7efa 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -29,15 +29,11 @@ let outputs = [ "out" "dev" ]; - nativeBuildInputs = [ - autoconf automake libtool autoreconfHook - ]; - buildInputs = [ libuuid ] ++ - stdenv.lib.optionals stdenv.isDarwin [ llvm libcxxabi libobjc ]; + nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + buildInputs = [ libuuid ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]; - patches = [ - ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch - ]; + patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ]; __propagatedImpureHostDeps = [ # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them @@ -48,7 +44,9 @@ let enableParallelBuilding = true; # TODO(@Ericson2314): Always pass "--target" and always targetPrefix. - configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; + configureFlags = [ "--disable-clang-as" ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cctools/Makefile.am --replace libobjc2 "" diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index a6063049a3a..4790145e01f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -60,7 +60,6 @@ in lib.init bootStages ++ [ ++ lib.optionals (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf buildPackages.paxctl ] - ++ lib.optional hostPlatform.isDarwin buildPackages.clang ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook |