diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-14 19:40:04 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-14 19:42:50 +0000 |
commit | 497033467f27e1063cee82ec64105a6d7ea74070 (patch) | |
tree | 270230ecdae9e7a67ebc18d661848ff6d9187a32 /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
parent | d4d82a6ef27ac9ad679ddfc1747f63a908bebbc4 (diff) | |
download | nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.tar nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.tar.gz nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.tar.bz2 nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.tar.lz nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.tar.xz nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.tar.zst nixpkgs-497033467f27e1063cee82ec64105a6d7ea74070.zip |
make-bootstrap-tools: fix test to include libstdc++ -rpath
After https://github.com/NixOS/nixpkgs/pull/209054 we started moving libstdc++.so out of default glibc's paths. This exposed bootstrap tools build failure as: $ nix build --no-link -f ./pkgs/stdenv/linux/make-bootstrap-tools.nix ... > .../bin/bar: error while loading shared libraries: libstdc++.so.6: cannot open shared object file: No such file or directory Note that bootstrap itself did not break. The change only expands handcrafted `-rpath` entries.
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
-rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index c6112766781..c087d016a2e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -272,16 +272,17 @@ in with pkgs; rec { gcc --version '' + lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' - ldlinux=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker}) - export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}" - 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" + rtld=$(echo ${bootstrapTools}/lib/${builtins.baseNameOf binutils.dynamicLinker}) + libc_includes=${bootstrapTools}/include-glibc '' + lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - ldmusl=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) - export CPP="cpp -idirafter ${bootstrapTools}/include-libc -B${bootstrapTools}" - 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" + rtld=$(echo ${bootstrapTools}/lib/ld-musl*.so.?) + libc_includes=${bootstrapTools}/include-libc '' + '' + # 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 <limits.h>' >> foo.c |