77da5efc78
Conflicts: pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken) pkgs/development/tools/misc/patchelf/default.nix (easy) pkgs/stdenv/generic/setup.sh (previous merge taken) |
||
---|---|---|
.. | ||
add-flags | ||
builder.sh | ||
default.nix | ||
gcc-wrapper.sh | ||
gnat-wrapper.sh | ||
gnatlink-wrapper.sh | ||
ld-solaris-wrapper.sh | ||
ld-wrapper.sh | ||
setup-hook.sh | ||
utils.sh |