From e45cc3aa7bd7dd48108dee7855d323afa66b660a Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Thu, 30 May 2024 05:29:02 +0300
Subject: [PATCH] tests-stdenv-gcc-stageCompare: cleanup

---
 pkgs/test/stdenv/gcc-stageCompare.nix | 58 ++++++++++++++++++---------
 1 file changed, 39 insertions(+), 19 deletions(-)

diff --git a/pkgs/test/stdenv/gcc-stageCompare.nix b/pkgs/test/stdenv/gcc-stageCompare.nix
index e5c2ed5921b30..95717ca9492a8 100644
--- a/pkgs/test/stdenv/gcc-stageCompare.nix
+++ b/pkgs/test/stdenv/gcc-stageCompare.nix
@@ -8,25 +8,45 @@
 # must remember to do the check.
 #
 
-{ stdenv
-, pkgs
-, lib
+{ lib
+, stdenv
+, runCommand
+, overrideCC
+, wrapCCWith
 }:
 
-assert stdenv.cc.isGNU;
-with pkgs;
-# rebuild gcc using the "final" stdenv
-let gcc-stageCompare = (gcc-unwrapped.override {
-      reproducibleBuild = true;
-      profiledCompiler = false;
-      stdenv = overrideCC stdenv (wrapCCWith {
-        cc = stdenv.cc;
-      });
-    }).overrideAttrs(_: {
-      NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out;
+let
+  inherit (stdenv.cc) cc;
+in
+
+assert cc.isGNU;
+
+# Rebuild gcc using the "final" stdenv.
+let
+  rebuiltCC = (cc.override {
+    reproducibleBuild = true;
+    profiledCompiler = false;
+    stdenv = overrideCC stdenv (wrapCCWith {
+      inherit cc;
     });
-in (runCommand "gcc-stageCompare" {} ''
-  diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out
-'').overrideAttrs (a: {
-  meta = (a.meta or { }) // { platforms = lib.platforms.linux; };
-})
+  }).overrideAttrs (_: {
+    # TODO: do we really have to set random seed? This likely won’t work with
+    # content-addressed derivations, and also GCC expects random seed to be
+    # different for each file (but that is an issue with stdenv in general).
+    # https://gcc.gnu.org/onlinedocs/gcc-14.1.0/gcc/Developer-Options.html#index-frandom-seed
+    # >The string should be different for every file you compile.
+    NIX_OUTPATH_USED_AS_RANDOM_SEED = cc.out;
+  });
+
+  cmdArgs = {
+    checksumBefore = cc.checksum;
+    checksumAfter = rebuiltCC.checksum;
+    meta.platforms = lib.platforms.linux;
+  };
+in
+runCommand "gcc-stageCompare" cmdArgs ''
+  diff --report-identical-files --recursive -- \
+    "$checksumBefore"/checksums \
+    "$checksumAfter"/checksums
+  touch $out
+''