fix: don't use bash to call the builds allow them to infer from the shebang

2024-06-22 10:39:58 +01:00 · 2024-06-22 10:39:58 +01:00 · 786738b368
parent 13c3f29d49
commit 786738b368
37 changed files with 74 additions and 37 deletions
--- a/foundation/src/stages/stage1/bash/default.nix
+++ b/foundation/src/stages/stage1/bash/default.nix
@ -106,7 +106,8 @@ in
            export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
            export AR="tcc -ar"
            export LD=tcc
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host} \
--- a/foundation/src/stages/stage1/binutils/default.nix
+++ b/foundation/src/stages/stage1/binutils/default.nix
@ -130,7 +130,8 @@ in
            export AR="tcc -ar"
            export lt_cv_sys_max_cmd_len=32768
            export CFLAGS="-D__LITTLE_ENDIAN__=1"
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}

            # Build
            make -j $NIX_BUILD_CORES all-libiberty all-gas all-bfd all-libctf all-zlib all-gprof
--- a/foundation/src/stages/stage1/bison/default.nix
+++ b/foundation/src/stages/stage1/bison/default.nix
@ -86,7 +86,8 @@ in
          cd bison-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/coreutils/default.nix
+++ b/foundation/src/stages/stage1/coreutils/default.nix
@ -98,7 +98,8 @@ in
            # Configure
            export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
            export LD=tcc
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}

            # Build
            make -j $NIX_BUILD_CORES AR="tcc -ar" MAKEINFO="true"
--- a/foundation/src/stages/stage1/diffutils/default.nix
+++ b/foundation/src/stages/stage1/diffutils/default.nix
@ -87,7 +87,8 @@ in
          # Configure
          export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
          export LD=tcc
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host}
--- a/foundation/src/stages/stage1/findutils/default.nix
+++ b/foundation/src/stages/stage1/findutils/default.nix
@ -92,7 +92,8 @@ in
          export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
          export AR="tcc -ar"
          export LD=tcc
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host}
--- a/foundation/src/stages/stage1/gawk/boot.nix
+++ b/foundation/src/stages/stage1/gawk/boot.nix
@ -68,7 +68,8 @@ in
            export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
            export ac_cv_func_getpgrp_void=yes
            export ac_cv_func_tzset=yes
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --build=${platform.build} \
              --host=${platform.host} \
              --disable-nls \
--- a/foundation/src/stages/stage1/gawk/default.nix
+++ b/foundation/src/stages/stage1/gawk/default.nix
@ -93,7 +93,8 @@ in
          export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
          export AR="tcc -ar"
          export LD=tcc
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host}
--- a/foundation/src/stages/stage1/gcc/default.nix
+++ b/foundation/src/stages/stage1/gcc/default.nix
@ -197,7 +197,8 @@ in
          export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
          export LIBRARY_PATH="${stage1.musl.package}/lib"

-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/gcc/v4.6.cxx.nix
+++ b/foundation/src/stages/stage1/gcc/v4.6.cxx.nix
@ -162,7 +162,8 @@ in
            export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
            export LIBRARY_PATH="${stage1.musl.package}/lib"

-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host} \
--- a/foundation/src/stages/stage1/gcc/v4.6.nix
+++ b/foundation/src/stages/stage1/gcc/v4.6.nix
@ -163,7 +163,8 @@ in
            export ac_cv_func_memcpy=yes
            export ac_cv_func_strerror=yes

-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host} \
--- a/foundation/src/stages/stage1/gcc/v8.nix
+++ b/foundation/src/stages/stage1/gcc/v8.nix
@ -167,7 +167,8 @@ in
          export CPLUS_INCLUDE_PATH="$C_INCLUDE_PATH"
          export LIBRARY_PATH="${stage1.musl.package}/lib"

-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/gnum4/default.nix
+++ b/foundation/src/stages/stage1/gnum4/default.nix
@ -85,7 +85,8 @@ in
          cd m4-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/gnumake/default.nix
+++ b/foundation/src/stages/stage1/gnumake/default.nix
@ -101,7 +101,8 @@ in
            # Configure
            export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
            export LD=tcc
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host}
--- a/foundation/src/stages/stage1/gnutar/boot.nix
+++ b/foundation/src/stages/stage1/gnutar/boot.nix
@ -58,7 +58,8 @@ in

            # Configure
            export CC="tcc -B ${stage1.tinycc.mes.libs.package}/lib"
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --build=${platform.build} \
              --host=${platform.host} \
              --disable-nls \
--- a/foundation/src/stages/stage1/gnutar/default.nix
+++ b/foundation/src/stages/stage1/gnutar/default.nix
@ -95,7 +95,8 @@ in
          cd tar-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/gnutar/musl.nix
+++ b/foundation/src/stages/stage1/gnutar/musl.nix
@ -59,7 +59,8 @@ in
          export ac_cv_sizeof_unsigned_long=4
          export ac_cv_sizeof_long_long=8
          export ac_cv_header_netdb_h=no
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/musl/boot.nix
+++ b/foundation/src/stages/stage1/musl/boot.nix
@ -118,7 +118,8 @@ in
              src/misc/wordexp.c

            # Configure
-            bash ./configure \
+            chmod +x configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host} \
--- a/foundation/src/stages/stage1/musl/default.nix
+++ b/foundation/src/stages/stage1/musl/default.nix
@ -95,7 +95,8 @@ in
            src/misc/wordexp.c

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/python/default.nix
+++ b/foundation/src/stages/stage1/python/default.nix
@ -104,7 +104,8 @@ in
            export C_INCLUDE_PATH="${stage1.zlib.package}/include"
            export LIBRARY_PATH="${stage1.zlib.package}/lib"
            export LD_LIBRARY_PATH="$LIBRARY_PATH"
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host}
--- a/foundation/src/stages/stage1/xz/default.nix
+++ b/foundation/src/stages/stage1/xz/default.nix
@ -88,7 +88,8 @@ in
          export CC="tcc -B ${stage1.tinycc.musl.libs.package}/lib"
          export AR="tcc -ar"
          export LD=tcc
-          bash ./configure \
+          chmod +x configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage1/zlib/default.nix
+++ b/foundation/src/stages/stage1/zlib/default.nix
@ -83,7 +83,8 @@ in

          # Configure
          export CC=musl-gcc
-          bash ./configure --prefix=$out
+          chmod +x configure
+          ./configure --prefix=$out

          # Build
          make -j $NIX_BUILD_CORES
--- a/foundation/src/stages/stage2/bash/default.nix
+++ b/foundation/src/stages/stage2/bash/default.nix
@ -94,7 +94,8 @@ in
          cd bash-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/binutils/default.nix
+++ b/foundation/src/stages/stage2/binutils/default.nix
@ -120,7 +120,8 @@ in
            ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}

            # Configure
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}

            # Build
            make -j $NIX_BUILD_CORES
--- a/foundation/src/stages/stage2/coreutils/default.nix
+++ b/foundation/src/stages/stage2/coreutils/default.nix
@ -99,7 +99,8 @@ in
            cd coreutils-${cfg.version}

            # Configure
-            bash ./configure ${builtins.concatStringsSep " " configureFlags}
+            chmod +x ./configure
+            ./configure ${builtins.concatStringsSep " " configureFlags}

            # Build
            make -j $NIX_BUILD_CORES
--- a/foundation/src/stages/stage2/diffutils/default.nix
+++ b/foundation/src/stages/stage2/diffutils/default.nix
@ -86,7 +86,8 @@ in
          cd diffutils-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/findutils/default.nix
+++ b/foundation/src/stages/stage2/findutils/default.nix
@ -86,7 +86,8 @@ in
          cd findutils-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gawk/default.nix
+++ b/foundation/src/stages/stage2/gawk/default.nix
@ -92,7 +92,8 @@ in
          cd gawk-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gcc/default.nix
+++ b/foundation/src/stages/stage2/gcc/default.nix
@ -191,7 +191,8 @@ in
          export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${stage1.musl.package}/lib/libc.so"
          export LIBRARY_PATH="${stage1.musl.package}/lib"

-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/glibc/default.nix
+++ b/foundation/src/stages/stage2/glibc/default.nix
@ -91,7 +91,8 @@ in
          cd build
          # libstdc++.so is built against musl and fails to link
          export CXX=false
-          bash ../configure \
+          chmod +x ../configure
+          ../configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gnugrep/default.nix
+++ b/foundation/src/stages/stage2/gnugrep/default.nix
@ -91,7 +91,8 @@ in
          cd grep-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gnumake/default.nix
+++ b/foundation/src/stages/stage2/gnumake/default.nix
@ -102,7 +102,8 @@ in
            ${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}

            # Configure
-            bash ./configure \
+            chmod +x ./configure
+            ./configure \
              --prefix=$out \
              --build=${platform.build} \
              --host=${platform.host} \
--- a/foundation/src/stages/stage2/gnupatch/default.nix
+++ b/foundation/src/stages/stage2/gnupatch/default.nix
@ -87,7 +87,8 @@ in
          cd patch-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gnused/default.nix
+++ b/foundation/src/stages/stage2/gnused/default.nix
@ -93,7 +93,8 @@ in
          cd sed-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gnutar/default.nix
+++ b/foundation/src/stages/stage2/gnutar/default.nix
@ -92,7 +92,8 @@ in
          cd tar-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/gzip/default.nix
+++ b/foundation/src/stages/stage2/gzip/default.nix
@ -85,7 +85,8 @@ in
          cd gzip-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \
--- a/foundation/src/stages/stage2/patchelf/default.nix
+++ b/foundation/src/stages/stage2/patchelf/default.nix
@ -86,7 +86,8 @@ in
          cd patchelf-${cfg.version}

          # Configure
-          bash ./configure \
+          chmod +x ./configure
+          ./configure \
            --prefix=$out \
            --build=${platform.build} \
            --host=${platform.host} \