diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-08-08 02:01:43 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-08-14 15:08:28 -0700 |
| commit | b5893e70468246bcd0062631c0cde3fc5687b362 (patch) | |
| tree | 6962b6dd031dc5f065a35cbfe4fcdebaea057e6b /pkgs/development/libraries/gcc/libgcc/default.nix | |
| parent | 2ecf2d954becdd97d78d41d663d0007d72714a5e (diff) | |
libgcc: let-float gccConfigureFlags out of the derivation attrs
Diffstat (limited to 'pkgs/development/libraries/gcc/libgcc/default.nix')
| -rw-r--r-- | pkgs/development/libraries/gcc/libgcc/default.nix | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix index be1e3a682579a..382140fd80c56 100644 --- a/pkgs/development/libraries/gcc/libgcc/default.nix +++ b/pkgs/development/libraries/gcc/libgcc/default.nix @@ -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" |