ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-02 17:09:09 +03:00
Code Issues Projects Releases Wiki Activity

cctools: don’t depend on clang at runtime

Browse Source 
--disable-clang-as flag disables the use of clang by cctools-port
This commit is contained in:
Matthew Bauer 2018-12-10 17:31:47 -06:00
parent 8dc4d1187e
commit 9564b8ed9e
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -29,15 +29,11 @@ let
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
autoconf automake libtool autoreconfHook buildInputs = [ libuuid ]
]; ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
buildInputs = [ libuuid ] ++
stdenv.lib.optionals stdenv.isDarwin [ llvm libcxxabi libobjc ];
patches = [ patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ];
./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
];
__propagatedImpureHostDeps = [ __propagatedImpureHostDeps = [
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them # 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; enableParallelBuilding = true;
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix. # 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 '' postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cctools/Makefile.am --replace libobjc2 "" substituteInPlace cctools/Makefile.am --replace libobjc2 ""

1
pkgs/stdenv/cross/default.nix
View File

@ -60,7 +60,6 @@ in lib.init bootStages ++ [
++ lib.optionals ++ lib.optionals
(hostPlatform.isLinux && !buildPlatform.isLinux) (hostPlatform.isLinux && !buildPlatform.isLinux)
[ buildPackages.patchelf buildPackages.paxctl ] [ buildPackages.patchelf buildPackages.paxctl ]
++ lib.optional hostPlatform.isDarwin buildPackages.clang
++ lib.optional ++ lib.optional
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
buildPackages.updateAutotoolsGnuConfigScriptsHook buildPackages.updateAutotoolsGnuConfigScriptsHook