Unverified Commit 4867914e authored by Atemu's avatar Atemu Committed by GitHub
Browse files

Merge pull request #250500 from trofi/fix-buildFHSEnv-BINTOOLS-wrapper 

buildFHSEnv: fix `NIX_LDFLAGS` propagation to `ld` wrapper
parents da938d19 2da03072

pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ let 


    # Force compilers and other tools to look in default search paths

    unset NIX_ENFORCE_PURITY

    export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

    export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

    export NIX_CFLAGS_COMPILE='-idirafter /usr/include'

    export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'

pkgs/build-support/build-fhsenv-chroot/env.nix

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ let 


    # Force compilers and other tools to look in default search paths

    unset NIX_ENFORCE_PURITY

    export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

    export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1

    export NIX_CFLAGS_COMPILE='-idirafter /usr/include'

    export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32'