mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge branch 'gcc-6' into gcc-7
This commit is contained in:
commit
e34a139f23
|
@ -130,6 +130,8 @@ let
|
|||
# Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
|
||||
cp "$src" expand-response-params.c
|
||||
"$CC" -std=c99 -O3 -o "$out" expand-response-params.c
|
||||
strip -S $out
|
||||
${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
|
||||
'';
|
||||
} else "";
|
||||
|
||||
|
@ -145,6 +147,7 @@ stdenv.mkDerivation {
|
|||
inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
|
||||
gnugrep_bin = if nativeTools then "" else gnugrep;
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
passthru = {
|
||||
inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile
|
||||
|
@ -164,7 +167,7 @@ stdenv.mkDerivation {
|
|||
|
||||
buildCommand =
|
||||
''
|
||||
mkdir -p $out/bin $out/nix-support
|
||||
mkdir -p $out/bin $out/nix-support $man/nix-support
|
||||
|
||||
wrap() {
|
||||
local dst="$1"
|
||||
|
@ -275,7 +278,8 @@ stdenv.mkDerivation {
|
|||
# Propagate the wrapped cc so that if you install the wrapper,
|
||||
# you get tools like gcov, the manpages, etc. as well (including
|
||||
# for binutils and Glibc).
|
||||
echo ${cc} ${cc.man or ""} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
|
||||
echo ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
|
||||
echo ${cc.man or ""} > $man/nix-support/propagated-user-env-packages
|
||||
|
||||
echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
|
||||
''
|
||||
|
|
Loading…
Reference in a new issue