b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libgcc: let-float gccConfigureFlags out of the derivation attrs

Browse source
This commit is contained in:
Adam Joseph 2023-08-08 02:01:43 -07:00
parent 2ecf2d954b
commit b5893e7046
1 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
pkgs/development/libraries/gcc/libgcc/default.nix
View file

@ -3,7 +3,33 @@
, libiberty
}:
stdenvNoLibs.mkDerivation (finalAttrs: {
let
gccConfigureFlags = gcc.cc.configureFlags ++ [
"--build=${stdenvNoLibs.buildPlatform.config}"
"--host=${stdenvNoLibs.buildPlatform.config}"
"--target=${stdenvNoLibs.hostPlatform.config}"
"--disable-bootstrap"
"--disable-multilib" "--with-multilib-list="
"--enable-languages=c"
"--disable-fixincludes"
"--disable-intl"
"--disable-lto"
"--disable-libatomic"
"--disable-libbacktrace"
"--disable-libcpp"
"--disable-libssp"
"--disable-libquadmath"
"--disable-libgomp"
"--disable-libvtv"
"--disable-vtable-verify"
"--with-system-zlib"
] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
"--with-glibc-version=${glibc.version}";
in stdenvNoLibs.mkDerivation (finalAttrs: {
pname = "libgcc";
inherit (gcc.cc) src version;
@ -57,7 +83,7 @@ stdenvNoLibs.mkDerivation (finalAttrs: {
# We define GENERATOR_FILE so nothing bothers looking for GNU GMP.
export NIX_CFLAGS_COMPILE_FOR_BUILD+=' -DGENERATOR_FILE=1'
"$sourceRoot/../gcc/configure" $gccConfigureFlags
"$sourceRoot/../gcc/configure" ${lib.concatStringsSep " " gccConfigureFlags}
# We remove the `libgcc.mvar` deps so that the bootstrap xgcc isn't built.
sed -e 's,libgcc.mvars:.*$,libgcc.mvars:,' -i Makefile
@ -97,31 +123,6 @@ stdenvNoLibs.mkDerivation (finalAttrs: {
export LD_FOR_TARGET=${stdenvNoLibs.cc.bintools}/bin/$LD_FOR_TARGET
'';
gccConfigureFlags = [
"--build=${stdenvNoLibs.buildPlatform.config}"
"--host=${stdenvNoLibs.buildPlatform.config}"
"--target=${stdenvNoLibs.hostPlatform.config}"
"--disable-bootstrap"
"--disable-multilib" "--with-multilib-list="
"--enable-languages=c"
"--disable-fixincludes"
"--disable-intl"
"--disable-lto"
"--disable-libatomic"
"--disable-libbacktrace"
"--disable-libcpp"
"--disable-libssp"
"--disable-libquadmath"
"--disable-libgomp"
"--disable-libvtv"
"--disable-vtable-verify"
"--with-system-zlib"
] ++ lib.optional (stdenvNoLibs.hostPlatform.libc == "glibc")
"--with-glibc-version=${glibc.version}";
configurePlatforms = [ "build" "host" ];
configureFlags = [
"--disable-dependency-tracking"