forked from mirrors/nixpkgs
darwin: use llvm’s dsymutil instead of dummy version
We were previously using a dummy wrapper for dsymutil. This meant that debug symbols were not getting generated when dsymutil was otherwise available. This should fix that issue & provide a real dsymutil from llvm. Fixes #52148.
This commit is contained in:
parent
921d046537
commit
0a996c8ef3
|
@ -1,5 +1,4 @@
|
||||||
{ stdenv, binutils-unwrapped, cctools
|
{ stdenv, binutils-unwrapped, cctools, llvm }:
|
||||||
}:
|
|
||||||
|
|
||||||
# Make sure both underlying packages claim to have prepended their binaries
|
# Make sure both underlying packages claim to have prepended their binaries
|
||||||
# with the same targetPrefix.
|
# with the same targetPrefix.
|
||||||
|
@ -8,12 +7,12 @@ assert binutils-unwrapped.targetPrefix == cctools.targetPrefix;
|
||||||
let
|
let
|
||||||
inherit (binutils-unwrapped) targetPrefix;
|
inherit (binutils-unwrapped) targetPrefix;
|
||||||
cmds = [
|
cmds = [
|
||||||
"ar" "ranlib" "as" "dsymutil" "install_name_tool"
|
"ar" "ranlib" "as" "install_name_tool"
|
||||||
"ld" "strip" "otool" "lipo" "nm" "strings" "size"
|
"ld" "strip" "otool" "lipo" "nm" "strings" "size"
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
|
|
||||||
# TODO loop over targetPrefixed binaries too
|
# TODO: loop over targetPrefixed binaries too
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "${targetPrefix}cctools-binutils-darwin";
|
name = "${targetPrefix}cctools-binutils-darwin";
|
||||||
outputs = [ "out" "info" "man" ];
|
outputs = [ "out" "info" "man" ];
|
||||||
|
@ -25,9 +24,8 @@ stdenv.mkDerivation {
|
||||||
# We specifically need:
|
# We specifically need:
|
||||||
# - ld: binutils doesn't provide it on darwin
|
# - ld: binutils doesn't provide it on darwin
|
||||||
# - as: as above
|
# - as: as above
|
||||||
# - ar: the binutils one prodices .a files that the cctools ld doesn't like
|
# - ar: the binutils one produces .a files that the cctools ld doesn't like
|
||||||
# - ranlib: for compatibility with ar
|
# - ranlib: for compatibility with ar
|
||||||
# - dsymutil: soon going away once it goes into LLVM (this one is fake anyway)
|
|
||||||
# - otool: we use it for some of our name mangling
|
# - otool: we use it for some of our name mangling
|
||||||
# - install_name_tool: we use it to rewrite stuff in our bootstrap tools
|
# - install_name_tool: we use it to rewrite stuff in our bootstrap tools
|
||||||
# - strip: the binutils one seems to break mach-o files
|
# - strip: the binutils one seems to break mach-o files
|
||||||
|
@ -37,6 +35,8 @@ stdenv.mkDerivation {
|
||||||
ln -sf "${cctools}/bin/$i" "$out/bin/$i"
|
ln -sf "${cctools}/bin/$i" "$out/bin/$i"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
ln -s ${llvm}/bin/llvm-dsymutil $out/bin/dsymutil
|
||||||
|
|
||||||
ln -s ${binutils-unwrapped.out}/share $out/share
|
ln -s ${binutils-unwrapped.out}/share $out/share
|
||||||
|
|
||||||
ln -s ${cctools}/libexec $out/libexec
|
ln -s ${cctools}/libexec $out/libexec
|
||||||
|
|
|
@ -92,13 +92,6 @@ let
|
||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
cat >$out/bin/dsymutil << EOF
|
|
||||||
#!${stdenv.shell}
|
|
||||||
EOF
|
|
||||||
chmod +x $out/bin/dsymutil
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit targetPrefix;
|
inherit targetPrefix;
|
||||||
};
|
};
|
||||||
|
|
|
@ -15,6 +15,7 @@ in
|
||||||
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
|
binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
|
||||||
inherit (darwin) cctools;
|
inherit (darwin) cctools;
|
||||||
inherit (pkgs) binutils-unwrapped;
|
inherit (pkgs) binutils-unwrapped;
|
||||||
|
inherit (pkgs.llvmPackages_5) llvm;
|
||||||
};
|
};
|
||||||
|
|
||||||
binutils = pkgs.wrapBintoolsWith {
|
binutils = pkgs.wrapBintoolsWith {
|
||||||
|
|
Loading…
Reference in a new issue