mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-20 11:11:43 -04:00
97c400a0e8
Before this commit, `pkgs/build-support/cc-wrapper/add-flags.sh` was using `-B@out@/bin` instead of `-B@bintools@/bin` to force `cc` to use `ld-wrapper.sh` when calling `ld`. That was confusing `cc` when asked to print the location of a library precisely named `c++` because `-B` prefixes are also used by `cc` to find libraries, see https://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html#index-B Indeed, instead of having `cc --print-file-name c++` failing to found a `c++` library and just returning the given `c++` string to let a linker resolve it thereafter, it was finding that `@out@/bin/c++` executable, mistaking it for a library and returning its absolute path, forcing the linker to load an executable as a library. Before this commit: ```console $ nix run -f . stdenv.cc -- --print-file-name c++ /nix/store/9bv7dcvmfcjnmg5mnqwqlq2wxfn8d7yi-gcc-wrapper-13.2.0/bin/c++ ``` After this commit: ```console $ nix run -f . stdenv.cc -- --print-file-name c++ c++ ``` Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23138#note_567034 where this behavior was breaking GHC on Darwin. [Confirmed by @414owen](https://github.com/NixOS/nixpkgs/pull/317224#issuecomment-2171276177): > This fixed all our haskell builds on Arm64 darwin, which were trying > to link in clang++...
91 lines
3.4 KiB
Bash
91 lines
3.4 KiB
Bash
# N.B. It may be a surprise that the derivation-specific variables are exported,
|
|
# since this is just sourced by the wrapped binaries---the end consumers. This
|
|
# is because one wrapper binary may invoke another (e.g. cc invoking ld). In
|
|
# that case, it is cheaper/better to not repeat this step and let the forked
|
|
# wrapped binary just inherit the work of the forker's wrapper script.
|
|
|
|
var_templates_list=(
|
|
NIX_CFLAGS_COMPILE
|
|
NIX_CFLAGS_COMPILE_BEFORE
|
|
NIX_CFLAGS_LINK
|
|
NIX_CXXSTDLIB_COMPILE
|
|
NIX_CXXSTDLIB_LINK
|
|
NIX_GNATFLAGS_COMPILE
|
|
)
|
|
var_templates_bool=(
|
|
NIX_ENFORCE_NO_NATIVE
|
|
)
|
|
|
|
accumulateRoles
|
|
|
|
# We need to mangle names for hygiene, but also take parameters/overrides
|
|
# from the environment.
|
|
for var in "${var_templates_list[@]}"; do
|
|
mangleVarList "$var" ${role_suffixes[@]+"${role_suffixes[@]}"}
|
|
done
|
|
for var in "${var_templates_bool[@]}"; do
|
|
mangleVarBool "$var" ${role_suffixes[@]+"${role_suffixes[@]}"}
|
|
done
|
|
|
|
# Arocc does not support "-B"
|
|
if [[ -z "@isArocc@" ]]; then
|
|
# `-B@bintools@/bin' forces cc to use ld-wrapper.sh when calling ld.
|
|
NIX_CFLAGS_COMPILE_@suffixSalt@="-B@bintools@/bin/ $NIX_CFLAGS_COMPILE_@suffixSalt@"
|
|
fi
|
|
|
|
# Export and assign separately in order that a failing $(..) will fail
|
|
# the script.
|
|
|
|
# Currently bootstrap-tools does not split glibc, and gcc files into
|
|
# separate directories. As a workaround we want resulting cflags to be
|
|
# ordered as: crt1-cflags libc-cflags cc-cflags. Otherwise we mix crt/libc.so
|
|
# from different libc as seen in
|
|
# https://github.com/NixOS/nixpkgs/issues/158042
|
|
#
|
|
# Note that below has reverse ordering as we prepend flags one-by-one.
|
|
# Once bootstrap-tools is split into different directories we can stop
|
|
# relying on flag ordering below.
|
|
|
|
if [ -e @out@/nix-support/cc-cflags ]; then
|
|
NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
|
|
fi
|
|
|
|
if [[ "$cInclude" = 1 ]] && [ -e @out@/nix-support/libc-cflags ]; then
|
|
NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
|
|
fi
|
|
|
|
if [ -e @out@/nix-support/libc-crt1-cflags ]; then
|
|
NIX_CFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/libc-crt1-cflags) $NIX_CFLAGS_COMPILE_@suffixSalt@"
|
|
fi
|
|
|
|
if [ -e @out@/nix-support/libcxx-cxxflags ]; then
|
|
NIX_CXXSTDLIB_COMPILE_@suffixSalt@+=" $(< @out@/nix-support/libcxx-cxxflags)"
|
|
fi
|
|
|
|
if [ -e @out@/nix-support/libcxx-ldflags ]; then
|
|
NIX_CXXSTDLIB_LINK_@suffixSalt@+=" $(< @out@/nix-support/libcxx-ldflags)"
|
|
fi
|
|
|
|
if [ -e @out@/nix-support/gnat-cflags ]; then
|
|
NIX_GNATFLAGS_COMPILE_@suffixSalt@="$(< @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE_@suffixSalt@"
|
|
fi
|
|
|
|
if [ -e @out@/nix-support/cc-ldflags ]; then
|
|
NIX_LDFLAGS_@suffixSalt@+=" $(< @out@/nix-support/cc-ldflags)"
|
|
fi
|
|
|
|
if [ -e @out@/nix-support/cc-cflags-before ]; then
|
|
NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@"
|
|
fi
|
|
|
|
# Only add darwin min version flag if a default darwin min version is set,
|
|
# which is a signal that we're targetting darwin.
|
|
if [ "@darwinMinVersion@" ]; then
|
|
mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"}
|
|
|
|
NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@"
|
|
fi
|
|
|
|
# That way forked processes will not extend these environment variables again.
|
|
export NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@=1
|