diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-10 17:31:47 -0600 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-12-10 17:31:47 -0600 |
| commit | 9564b8ed9e77b527cb7443b3a7c62638454a3f31 (patch) | |
| tree | d07efeaff1d28ab856c0f89ce4d5c2c060db02c1 /pkgs/os-specific/darwin/cctools/port.nix | |
| parent | 8dc4d1187ef69dfadf50d1c8660aea7a7d347b73 (diff) | |
| download | nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.tar nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.tar.gz nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.tar.bz2 nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.tar.lz nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.tar.xz nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.tar.zst nixpkgs-9564b8ed9e77b527cb7443b3a7c62638454a3f31.zip | |
cctools: don’t depend on clang at runtime
--disable-clang-as flag disables the use of clang by cctools-port
Diffstat (limited to 'pkgs/os-specific/darwin/cctools/port.nix')
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 16 |
1 files changed, 7 insertions, 9 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 "" |