diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-07-24 08:16:21 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-07-24 09:54:49 +0100 |
commit | ea8e1240009ed947066387fd8fd17e481c7ec480 (patch) | |
tree | dac3d02f10833e73fab87dbf0f310d1d234774a1 /pkgs/development/compilers/gcc/10/default.nix | |
parent | 21966e13d2d72b91ce73a2f3f03faf62d8a9e59f (diff) |
gcc: always enable inhibit_libc=true for --without-headers builds
It's a follow-up to the breakage caused by 21966e13d2d72b91c ("gcc: pass --with-build-sysroot=/"). It caused `pkgsLLVM` cross-toolchain bootstrap breakage: $ nix build --no-link -f. pkgsLLVM.hello ... failed: /nix/store/...-x86_64-unknown-linux-gnu-stage-static-gcc-13.0.0.drv: ... configure flags: ... --enable-languages=c --disable-multilib \ --disable-shared --enable-plugin ... --disable-libssp --disable-nls \ --without-headers --disable-threads --disable-libgomp --disable-libquadmath \ --disable-shared --disable-libatomic --disable-decimal-float --disable-libmpx \ --disable-bootstrap \ \ --build=x86_64-unknown-linux-gnu \ --host=x86_64-unknown-linux-gnu \ --target=x86_64-unknown-linux-gnu ... The directory that should contain system headers does not exist: /usr/include make[2]: *** [Makefile:3279: stmp-fixinc] Error 1 shuffle=1658621302 rm gfdl.pod gcc.pod gcov-dump.pod gcov-tool.pod fsf-funding.pod gpl.pod cpp.pod gcov.pod lto-dump.pod make[2]: Leaving directory '/build/build/gcc' Note: it's a no-libc build. It's not expected to use any libc headers. But in this case fixincludes tries to run and uses default /usr/include location. Fixinsludes is not normally expected to run during cross-compilation on --without-headers. gcc/configure.ac: : ${inhibit_libc=false} if { { test x$host != x$target && test "x$with_sysroot" = x ; } || test x$with_newlib = xyes ; } && { test "x$with_headers" = xno || test ! -f "$target_header_dir/stdio.h"; } ; then inhibit_libc=true fi The change explicitly passes inhibit_libc=true to configure to disable include fixing on such cases. Fixed `nix build --no-link -f. pkgsLLVM.hello` toolchain bootstrap.
Diffstat (limited to 'pkgs/development/compilers/gcc/10/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 1b9f542894e07..aead3fa21fff2 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic; }; dontDisableStatic = true; |