mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #210752 from trofi/make-bootstrap-tools-libstdcxx-rpath
make-bootstrap-tools: fix test to include libstdc++ -rpath
This commit is contained in:
commit
9c0068c40e
|
@ -272,16 +272,17 @@ in with pkgs; rec {
|
||||||
gcc --version
|
gcc --version
|
||||||
|
|
||||||
'' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
|
'' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
|
||||||
ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker})
|
rtld=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker})
|
||||||
export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"
|
libc_includes=${bootstrapTools}/include-glibc
|
||||||
export CC="gcc -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
|
|
||||||
export CXX="g++ -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${bootstrapTools}/lib"
|
|
||||||
'' + lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
|
'' + lib.optionalString (stdenv.hostPlatform.libc == "musl") ''
|
||||||
ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)
|
rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?)
|
||||||
export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}"
|
libc_includes=${bootstrapTools}/include-libc
|
||||||
export CC="gcc -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"
|
|
||||||
export CXX="g++ -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools} -Wl,-dynamic-linker,$ldmusl -Wl,-rpath,${bootstrapTools}/lib"
|
|
||||||
'' + ''
|
'' + ''
|
||||||
|
# path to version-specific libraries, like libstdc++.so
|
||||||
|
cxx_libs=$(echo ${bootstrapTools}/lib/gcc/*/*)
|
||||||
|
export CPP="cpp -idirafter $libc_includes -B${bootstrapTools}"
|
||||||
|
export CC="gcc -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs"
|
||||||
|
export CXX="g++ -idirafter $libc_includes -B${bootstrapTools} -Wl,-dynamic-linker,$rtld -Wl,-rpath,${bootstrapTools}/lib -Wl,-rpath,$cxx_libs"
|
||||||
|
|
||||||
echo '#include <stdio.h>' >> foo.c
|
echo '#include <stdio.h>' >> foo.c
|
||||||
echo '#include <limits.h>' >> foo.c
|
echo '#include <limits.h>' >> foo.c
|
||||||
|
|
Loading…
Reference in a new issue