gcc-unwrapped: set main program

RossComputerGuy · RossComputerGuy · commit a15599036134 · 2025-07-28T00:08:36.000-07:00
diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -20,6 +20,7 @@
   enablePlugin,
   disableGdbPlugin ? !enablePlugin,
   enableShared,
+  targetPrefix,
 
   langC,
   langCC,
@@ -59,10 +60,6 @@ let
   crossDarwin =
     (!lib.systems.equals targetPlatform hostPlatform) && targetPlatform.libc == "libSystem";
 
-  targetPrefix = lib.optionalString (
-    !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform
-  ) "${stdenv.targetPlatform.config}-";
-
   crossConfigureFlags =
     # Ensure that -print-prog-name is able to find the correct programs.
     [
diff --git a/pkgs/development/compilers/gcc/common/meta.nix b/pkgs/development/compilers/gcc/common/meta.nix
@@ -1,4 +1,8 @@
-{ lib, version }:
+{
+  lib,
+  version,
+  targetPrefix,
+}:
 
 let
   inherit (lib)
@@ -24,5 +28,6 @@ in
 
   platforms = platforms.unix;
   teams = [ teams.gcc ];
+  mainProgram = "${targetPrefix}gcc";
 
 }
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
@@ -119,6 +119,10 @@ let
     !lib.systems.equals targetPlatform hostPlatform
   ) "${targetPlatform.config}${stageNameAddon}-";
 
+  targetPrefix = lib.optionalString (
+    !lib.systems.equals stdenv.targetPlatform stdenv.hostPlatform
+  ) "${stdenv.targetPlatform.config}-";
+
   callFile = callPackageWith {
     # lets
     inherit
@@ -340,7 +344,7 @@ pipe
         "target"
       ];
 
-      configureFlags = callFile ./common/configure-flags.nix { };
+      configureFlags = callFile ./common/configure-flags.nix { inherit targetPrefix; };
 
       inherit targetConfig;
 
@@ -449,13 +453,14 @@ pipe
       inherit enableShared enableMultilib;
 
       meta = {
-        inherit (callFile ./common/meta.nix { })
+        inherit (callFile ./common/meta.nix { inherit targetPrefix; })
           homepage
           license
           description
           longDescription
           platforms
           teams
+          mainProgram
           ;
       }
       // optionalAttrs (!atLeast11) {
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix
@@ -102,6 +102,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.nix
@@ -84,6 +84,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix
@@ -101,6 +101,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix b/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix
@@ -100,6 +100,7 @@ bash.runCommand "${pname}-${version}"
       license = licenses.gpl3Plus;
       teams = [ teams.minimal-bootstrap ];
       platforms = platforms.unix;
+      mainProgram = "gcc";
     };
   }
   ''

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ bash.runCommand "${pname}-${version}"`
`102`	`102`	`license = licenses.gpl3Plus;`
`103`	`103`	`teams = [ teams.minimal-bootstrap ];`
`104`	`104`	`platforms = platforms.unix;`
	`105`	`+ mainProgram = "gcc";`
`105`	`106`	`};`
`106`	`107`	`}`
`107`	`108`	`''`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ bash.runCommand "${pname}-${version}"`
`84`	`84`	`license = licenses.gpl3Plus;`
`85`	`85`	`teams = [ teams.minimal-bootstrap ];`
`86`	`86`	`platforms = platforms.unix;`
	`87`	`+ mainProgram = "gcc";`
`87`	`88`	`};`
`88`	`89`	`}`
`89`	`90`	`''`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ bash.runCommand "${pname}-${version}"`
`101`	`101`	`license = licenses.gpl3Plus;`
`102`	`102`	`teams = [ teams.minimal-bootstrap ];`
`103`	`103`	`platforms = platforms.unix;`
	`104`	`+ mainProgram = "gcc";`
`104`	`105`	`};`
`105`	`106`	`}`
`106`	`107`	`''`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ bash.runCommand "${pname}-${version}"`
`100`	`100`	`license = licenses.gpl3Plus;`
`101`	`101`	`teams = [ teams.minimal-bootstrap ];`
`102`	`102`	`platforms = platforms.unix;`
	`103`	`+ mainProgram = "gcc";`
`103`	`104`	`};`
`104`	`105`	`}`
`105`	`106`	`''`