public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc-wrapper: correct ccLDFlags with multiple outputs 

Note: -B argument seems more like for gcc's main output,
though it's used in a bit strange way here.
(Upstream default is /usr/lib/gcc/ which we don't move.)
This commit is contained in:
Vladimír Čunát 2015-10-25 11:33:39 +01:00
parent cd7a78d7e4
commit 55d129609d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/build-support/cc-wrapper/default.nix
View File

@ -29,6 +29,7 @@ let
libc_bin = if nativeLibc then null else libc.bin or libc; libc_bin = if nativeLibc then null else libc.bin or libc;
libc_dev = if nativeLibc then null else libc.dev or libc; libc_dev = if nativeLibc then null else libc.dev or libc;
libc_lib = if nativeLibc then null else libc.out or libc; libc_lib = if nativeLibc then null else libc.out or libc;
cc_solib = cc.lib or cc;
binutils_bin = if nativeTools then null else binutils.bin or binutils; binutils_bin = if nativeTools then null else binutils.bin or binutils;
# The wrapper scripts use 'cat', so we may need coreutils. # The wrapper scripts use 'cat', so we may need coreutils.
coreutils_bin = if nativeTools then null else coreutils.bin or coreutils; coreutils_bin = if nativeTools then null else coreutils.bin or coreutils;
@ -105,14 +106,14 @@ stdenv.mkDerivation {
# $cc/lib64 (even though it does actually search there...).. # $cc/lib64 (even though it does actually search there...)..
# This confuses libtool. So add it to the compiler tool search # This confuses libtool. So add it to the compiler tool search
# path explicitly. # path explicitly.
if [ -e "$cc/lib64" -a ! -L "$cc/lib64" ]; then if [ -e "${cc.out}/lib64" -a ! -L "${cc.out}/lib64" ]; then
ccLDFlags+=" -L$cc/lib64" ccLDFlags+=" -L${cc_solib}/lib64"
ccCFlags+=" -B$cc/lib64" ccCFlags+=" -B${cc.out}/lib64"
fi fi
ccLDFlags+=" -L$cc/lib" ccLDFlags+=" -L${cc_solib}/lib"
${optionalString cc.langVhdl or false '' ${optionalString cc.langVhdl or false ''
ccLDFlags+=" -L${zlib}/lib" ccLDFlags+=" -L${zlib.out}/lib"
''} ''}
# Find the gcc libraries path (may work only without multilib). # Find the gcc libraries path (may work only without multilib).