646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
20 lines
653 B
Diff
20 lines
653 B
Diff
diff --git a/binutils/resrc.c b/binutils/resrc.c
|
|
index a875c3a4..0411d047 100644
|
|
--- a/binutils/resrc.c
|
|
+++ b/binutils/resrc.c
|
|
@@ -521,7 +521,13 @@ read_rc_file (const char *filename, const char *preprocessor,
|
|
|
|
cpp_pipe = 0;
|
|
|
|
- if (dash)
|
|
+ /* Nixpkgs specific : look first at the prefixed path
|
|
+ ( there should be no gcc in the binutils folder ) */
|
|
+ if (slash && dash) {
|
|
+ cpp_pipe = look_for_default(cmd, slash + 1, dash - slash, preprocargs, filename);
|
|
+ }
|
|
+
|
|
+ if (dash && ! cpp_pipe)
|
|
{
|
|
/* First, try looking for a prefixed gcc in the windres
|
|
directory, with the same prefix as windres */
|