pkgs/_bootstrap/clang, pkgs/stdenv/clang: build-dir reproducibility fixes

Author: t184256

.maint/hashes

@@ -2,10 +2,10 @@
 cr1bxa6hjz1baygh7kdwmhgxvypqcvag bootstrap-toolchain
 2f7xfn3x1bgpy1wdrnn48z3c1bagwggh bootstrap-busybox
 w4gcaxrzw0jg1darbh5m1kqc2chi916l stdenv.musl
-nl6ki5lh9m3nqj10pljwvfrbihpcin3k stdenv.clang^toolchain
-zc6lnh6w6akpn6gw819xa1fl9jpjdxgd stdenv.clang^sysroot
+b9hw86jiv5633wxnqmgfvppjzj4gyb42 stdenv.clang^toolchain
+y2cxnwccxv568n1qyq0k8hhd46paakyh stdenv.clang^sysroot
 xd59ibybsg7a3xmfv2jawhsklsh3y5cw stdenv.busybox
-81j8zwidvjzkzgawbkgynx9asc5xqmnv stdenv.patchelf
+3drv7qr3l6yg884aydvnsfg8liay7n8b stdenv.patchelf
 rayis1a5x2vbnvx2rn2p101p6hkjr80s gnumake
 nk2z6rqnd29lm71y3m90lknhnkhy59aq pkg-config
 k2xrd04a2rg5544ybx7m5ighzgbg3qsa zstd
@@ -35,8 +35,8 @@ ybxc8hcw1jlik2gikfy75jdr235irb74 editline
 ib8rkp6syqjl53ihgw3ivrj2875m8iaz libsodium
 blifdiax8l3anpvfbz0q12h6xikj11xz libarchive
 kva7q87mxpnh51ms9nsn0q13yg3nx3cn nlohmann_json
-f7633g4nyffhhb2qxjzmgp1zbb4696q8 nix
-89h5i0h2yghwgaj19lfqpsqp0mg5csq6 live-cd^initscript
-20pw1kdqalgybjqcxlsxwrb259z9rq7n live-cd^initrd
+4fnlcxja9lqsha8a6aq53qkqvd3rrawa nix
+4j81lc5b1niai5kmay1bs5ziy918abic live-cd^initscript
+0nvqsapj0ynqd4nqhcb7q6kls7dl7s5l live-cd^initrd
 00knav8mnf7nsq6p34xv5ax9rl68kxzz live-cd^limine_config
-l4a6183ziakj977gc7d1rzf9jlcc2psk live-cd^iso
+p29sxck8mymhc72jaaq294hj7vj422hy live-cd^iso

pkgs/_bootstrap/clang.nix

@@ -12,7 +12,15 @@ in
     inherit name;
     buildInputs = [ busybox toolchain cmake gnumake python ];
     script = ''
-        mkdir build-dir; cd build-dir
+        # Shared libs are not relinked on install. Instead, their rpath
+        # is erased with RPATH_SET: `Set runtime path of
+        # "/nix/store/.../lib/x86_64-unknown-linux-musl/libc++.so.1.0" to ""`
+        # One (hacky) workaround to that is using a constant-len build-dir.
+        build_dir=build-dir; expr "$(pwd)/$build_dir)" '<=' 128
+        while ! echo "$(pwd)/$build_dir" | wc -c | grep -Fqx 128; do
+          build_dir="$build_dir."
+        done; expr "$(echo $(pwd)/$build_dir | wc -c)" '==' 128
+        mkdir $build_dir; cd $build_dir
         export SHELL=${busybox}/bin/ash
         # llvm cmake configuration should pick up ccache automatically from PATH
         export PATH="$PATH:/ccache/bin"
@@ -39,7 +47,10 @@ in
           llvm/cmake/modules/AddLLVM.cmake
         sed -i 's|numShards = 32;|numShards = 1;|' lld/*/SyntheticSections.*
         sed -i 's|numShards = 256;|numShards = 1;|' lld/*/ICF.cpp
-        sed -i 's|__FILE__|__FILE_NAME__|' compiler-rt/lib/builtins/int_util.h
+        sed -i 's|__FILE__|__FILE_NAME__|' \
+          libcxx/src/verbose_abort.cpp \
+          libcxxabi/src/abort_message.cpp \
+          compiler-rt/lib/builtins/int_util.h
       # figure out includes:
         KHDR=${linux-headers}/include
         EXTRA_INCL=$(pwd)/extra_includes

pkgs/stdenv/clang.nix

@@ -1,14 +1,16 @@
 { pname ? "clang", fetchurl, stdenv, gnumake, linux-headers, cmake, python}:
 
-stdenv.mkDerivation {
-  pname = pname;
-  version = "17.0.1";
-
+let
   src = fetchurl {  # parsed by other tooling, must be of fixed format
     # local = /downloads/llvm-project-17.0.1.src.tar.xz;
     url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.1/llvm-project-17.0.1.src.tar.xz";
     sha256 = "b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9";
   };
+in
+
+stdenv.mkDerivation {
+  inherit pname src;
+  version = "17.0.1";
 
   buildInputs = [ stdenv.busybox gnumake cmake python ];
                 # stdenv.clang not added to PATH on purpose to avoid confusion
@@ -28,7 +30,10 @@ stdenv.mkDerivation {
       llvm/cmake/modules/AddLLVM.cmake
     sed -i 's|numShards = 32;|numShards = 1;|' lld/*/SyntheticSections.*
     sed -i 's|numShards = 256;|numShards = 1;|' lld/*/ICF.cpp
-    sed -i 's|__FILE__|__FILE_NAME__|' compiler-rt/lib/builtins/int_util.h
+    sed -i 's|__FILE__|__FILE_NAME__|' \
+      libcxx/src/verbose_abort.cpp \
+      libcxxabi/src/abort_message.cpp \
+      compiler-rt/lib/builtins/int_util.h
   '';
 
   preConfigure = ''
@@ -40,6 +45,15 @@ stdenv.mkDerivation {
   '';
 
   configurePhase = ''
+    # Shared libs are not relinked on install. Instead, their rpath
+    # is erased with RPATH_SET: `Set runtime path of
+    # "/nix/store/.../lib/x86_64-unknown-linux-musl/libc++.so.1.0" to ""`
+    # One (hacky) workaround to that is using a constant-len build-dir.
+    build_dir=build; expr "$(pwd)/$build_dir)" '<=' 134
+    while ! echo "$(pwd)/$build_dir" | wc -c | grep -Fqx 134; do
+      build_dir="$build_dir."
+    done; mkdir $build_dir; expr "$(echo $(pwd)/build* | wc -c)" '==' 134
+
     export SHELL=${stdenv.busybox}/bin/ash
     LOADER=${stdenv.musl}/lib/libc.so
 
@@ -59,12 +73,12 @@ stdenv.mkDerivation {
 
     export LD_LIBRARY_PATH="${stdenv.musl}/lib:${stdenv.clang}/lib"
     export LD_LIBRARY_PATH=${python}/lib:$LD_LIBRARY_PATH
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/build/lib" # libLLVM
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/$build_dir/lib" # libLLVM
 
     REWRITE="-ffile-prefix-map=$(pwd)=/builddir/"
     CFLAGS="--sysroot=$(pwd)/sysroot -isystem $EXTRA_INCL $REWRITE"
     LDFLAGS="-Wl,--dynamic-linker=$LOADER"
-    cmake -S llvm -B build -G 'Unix Makefiles' \
+    cmake -S llvm -B build* -G 'Unix Makefiles' \
       -DCMAKE_ASM_COMPILER=${stdenv.clang}/bin/clang \
       -DCMAKE_C_COMPILER=${stdenv.clang}/bin/clang \
       -DCMAKE_CXX_COMPILER=${stdenv.clang}/bin/clang++ \
@@ -124,21 +138,23 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
+    build_dir=$(echo build*)
     export SHELL=${stdenv.busybox}/bin/ash
     export LD_LIBRARY_PATH="${stdenv.musl}/lib:${stdenv.clang}/lib"
     export LD_LIBRARY_PATH=${python}/lib:$LD_LIBRARY_PATH
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/build/lib" # libLLVM
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/$build_dir/lib" # libLLVM
 
     # llvm cmake configuration should pick up ccache automatically from PATH
-    make -C build -j $NPROC
+    make -C build* -j $NPROC
   '';
 
   installPhase = ''
+    build_dir=$(echo build*)
+    export SHELL=${stdenv.busybox}/bin/ash
     export LD_LIBRARY_PATH="${stdenv.musl}/lib:${stdenv.clang}/lib"
     export LD_LIBRARY_PATH=${python}/lib:$LD_LIBRARY_PATH
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/build/lib" # libLLVM
-    export SHELL=${stdenv.busybox}/bin/ash
-    make -C build -j $NPROC install/strip
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$(pwd)/$build_dir/lib" # libLLVM
+    make -C build* -j $NPROC install/strip
   '';
 
   postInstall = ''