2017-08-28 18:56:08 +00:00
|
|
|
# Binutils Wrapper hygiene
|
|
|
|
#
|
|
|
|
# See comments in cc-wrapper's setup hook. This works exactly the same way.
|
|
|
|
|
2017-08-03 16:45:06 +00:00
|
|
|
set -u
|
|
|
|
|
2017-08-28 15:33:08 +00:00
|
|
|
# Skip setup hook if we're neither a build-time dep, nor, temporarily, doing a
|
|
|
|
# native compile.
|
|
|
|
#
|
|
|
|
# TODO(@Ericson2314): No native exception
|
2018-05-13 15:31:24 +00:00
|
|
|
[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0
|
2017-08-03 16:45:06 +00:00
|
|
|
|
2017-08-28 18:56:08 +00:00
|
|
|
bintoolsWrapper_addLDVars () {
|
2018-05-07 17:07:19 +00:00
|
|
|
# See ../setup-hooks/role.bash
|
|
|
|
local role_post role_pre
|
2018-06-01 23:42:05 +00:00
|
|
|
getHostRoleEnvHook
|
2017-08-28 18:56:08 +00:00
|
|
|
|
|
|
|
if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
|
2018-05-07 17:07:19 +00:00
|
|
|
export NIX_${role_pre}LDFLAGS+=" -L$1/lib64"
|
2017-08-28 18:56:08 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [[ -d "$1/lib" ]]; then
|
Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.
* libffi: simplify using `checkInputs`
* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix
* utillinux: 2.32 -> 2.32.1
https://lkml.org/lkml/2018/7/16/532
* busybox: 1.29.0 -> 1.29.1
* bind: 9.12.1-P2 -> 9.12.2
https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html
* curl: 7.60.0 -> 7.61.0
* gvfs: make tests run, but disable
* ilmbase: disable tests on i686. Spooky!
* mdds: fix tests
* git: disable checks as tests are run in installcheck
* ruby: disable tests
* libcommuni: disable checks as tests are run in installcheck
* librdf: make tests run, but disable
* neon, neon_0_29: make tests run, but disable
* pciutils: 3.6.0 -> 3.6.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.
* mesa: more include fixes
mostly from void-linux (thanks!)
* npth: 1.5 -> 1.6
minor bump
* boost167: Add lockfree next_prior patch
* stdenv: cleanup darwin bootstrapping
Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.
* Revert "pciutils: use standardized equivalent for canonicalize_file_name"
This reverts commit f8db20fb3ae382eba1ba2b160fe24739f43c0bd7.
Patching should no longer be needed with 3.6.1.
* binutils-wrapper: Try to avoid adding unnecessary -L flags
(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>
* libffi: don't check on darwin
libffi usages in stdenv broken darwin. We need to disable doCheck for that case.
* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook
* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273
When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.
* parity-ui: fix after merge
* python.pkgs.pytest-flake8: disable test, fix build
* Revert "meson: 0.46.1 -> 0.47.0"
With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.
When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.
Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.
I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)
This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.
--
Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).
Fixes #43650.
This reverts commit 305ac4dade5758c58e8ab1666ad0197fd305828d.
(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 14:04:48 +00:00
|
|
|
# Don't add the /lib directory if it actually doesn't contain any libraries. For instance,
|
|
|
|
# Python and Haskell packages often only have directories like $out/lib/ghc-8.4.3/ or
|
|
|
|
# $out/lib/python3.6/, so having them in LDFLAGS just makes the linker search unnecessary
|
|
|
|
# directories and bloats the size of the environment variable space.
|
|
|
|
if [[ -n "$(echo $1/lib/lib*)" ]]; then
|
|
|
|
export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
|
|
|
|
fi
|
2017-08-28 18:56:08 +00:00
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
2018-05-07 17:07:19 +00:00
|
|
|
# See ../setup-hooks/role.bash
|
|
|
|
getTargetRole
|
|
|
|
getTargetRoleWrapper
|
2017-08-28 18:56:08 +00:00
|
|
|
|
2017-08-03 16:45:06 +00:00
|
|
|
addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars
|
2017-08-28 18:56:08 +00:00
|
|
|
|
|
|
|
# shellcheck disable=SC2157
|
|
|
|
if [ -n "@bintools_bin@" ]; then
|
|
|
|
addToSearchPath _PATH @bintools_bin@/bin
|
|
|
|
fi
|
|
|
|
|
|
|
|
# shellcheck disable=SC2157
|
|
|
|
if [ -n "@libc_bin@" ]; then
|
|
|
|
addToSearchPath _PATH @libc_bin@/bin
|
|
|
|
fi
|
|
|
|
|
|
|
|
# shellcheck disable=SC2157
|
|
|
|
if [ -n "@coreutils_bin@" ]; then
|
|
|
|
addToSearchPath _PATH @coreutils_bin@/bin
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Export tool environment variables so various build systems use the right ones.
|
|
|
|
|
|
|
|
export NIX_${role_pre}BINTOOLS=@out@
|
|
|
|
|
|
|
|
for cmd in \
|
|
|
|
ar as ld nm objcopy objdump readelf ranlib strip strings size windres
|
|
|
|
do
|
|
|
|
if
|
2018-08-06 22:35:56 +00:00
|
|
|
cmd_path=$(PATH=$_PATH command -v "@targetPrefix@${cmd}")
|
2017-08-28 18:56:08 +00:00
|
|
|
then
|
|
|
|
upper_case="$(echo "$cmd" | tr "[:lower:]" "[:upper:]")"
|
2018-08-06 22:35:56 +00:00
|
|
|
export "${role_pre}${upper_case}=${cmd_path}";
|
|
|
|
export "${upper_case}${role_post}=${cmd_path}";
|
2017-08-28 18:56:08 +00:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2018-04-11 18:00:13 +00:00
|
|
|
# If unset, assume the default hardening flags.
|
|
|
|
: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}
|
|
|
|
export NIX_HARDENING_ENABLE
|
|
|
|
|
2017-08-28 18:56:08 +00:00
|
|
|
# No local scope in sourced file
|
2018-08-06 22:35:56 +00:00
|
|
|
unset -v role_pre role_post cmd cmd_path upper_case
|
2017-08-03 16:45:06 +00:00
|
|
|
set +u
|