Merge pull request #18135 from veprbl/ccache_fix

ccache: enable build on darwin
This commit is contained in:
Daiderd Jordan 2016-09-17 22:35:43 +02:00 committed by GitHub
commit afa64a60bc

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }: { stdenv, fetchurl, fetchpatch, runCommand, zlib }:
let ccache = stdenv.mkDerivation rec { let ccache = stdenv.mkDerivation rec {
name = "ccache-${version}"; name = "ccache-${version}";
@ -15,43 +15,46 @@ let ccache = stdenv.mkDerivation rec {
substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)'
''; '';
doCheck = true; doCheck = !stdenv.isDarwin;
passthru = { passthru = let
cc = stdenv.cc.cc;
ccname = if stdenv.cc.cc.isClang or false then "clang" else "gcc";
cxxname = if stdenv.cc.cc.isClang or false then "clang++" else "g++";
in {
# A derivation that provides gcc and g++ commands, but that # A derivation that provides gcc and g++ commands, but that
# will end up calling ccache for the given cacheDir # will end up calling ccache for the given cacheDir
links = extraConfig: stdenv.mkDerivation rec { links = extraConfig: stdenv.mkDerivation rec {
name = "ccache-links"; name = "ccache-links";
passthru = { passthru = {
inherit gcc; inherit (cc) isGNU isClang;
isGNU = true;
}; };
inherit (gcc.cc) lib; inherit (cc) lib;
buildCommand = '' buildCommand = ''
mkdir -p $out/bin mkdir -p $out/bin
if [ -x "${gcc.cc}/bin/gcc" ]; then if [ -x "${cc}/bin/${ccname}" ]; then
cat > $out/bin/gcc << EOF cat > $out/bin/${ccname} << EOF
#!/bin/sh #!/bin/sh
${extraConfig} ${extraConfig}
exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@" exec ${ccache}/bin/ccache ${cc}/bin/${ccname} "\$@"
EOF EOF
chmod +x $out/bin/gcc chmod +x $out/bin/${ccname}
fi fi
if [ -x "${gcc.cc}/bin/g++" ]; then if [ -x "${cc}/bin/${cxxname}" ]; then
cat > $out/bin/g++ << EOF cat > $out/bin/${cxxname} << EOF
#!/bin/sh #!/bin/sh
${extraConfig} ${extraConfig}
exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@" exec ${ccache}/bin/ccache ${cc}/bin/${cxxname} "\$@"
EOF EOF
chmod +x $out/bin/g++ chmod +x $out/bin/${cxxname}
fi fi
for executable in $(ls ${gcc.cc}/bin); do for executable in $(ls ${cc}/bin); do
if [ ! -x "$out/bin/$executable" ]; then if [ ! -x "$out/bin/$executable" ]; then
ln -s ${gcc.cc}/bin/$executable $out/bin/$executable ln -s ${cc}/bin/$executable $out/bin/$executable
fi fi
done done
for file in $(ls ${gcc.cc} | grep -vw bin); do for file in $(ls ${cc} | grep -vw bin); do
ln -s ${gcc.cc}/$file $out/$file ln -s ${cc}/$file $out/$file
done done
''; '';
}; };
@ -63,7 +66,7 @@ let ccache = stdenv.mkDerivation rec {
downloadPage = https://ccache.samba.org/download.html; downloadPage = https://ccache.samba.org/download.html;
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ nckx ]; maintainers = with maintainers; [ nckx ];
platforms = with platforms; linux; platforms = platforms.unix;
}; };
}; };
in ccache in ccache