2edfccf61d
There was a bug in 2.36.* of missing Makefile dependencies. The previous workaround was to require 2.36 to be built serially. This is now fixed upstream in 2.37 and this PR adds the patch to restore parallel make to 2.36.
54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
This patch fixes parallel make for versions 2.36.*. This is taken
|
|
from commit 755ba58ebef0 without the diff for ChangeLog. The changes
|
|
to ChangeLog are prepend only, so that diff only applies cleanly to
|
|
the previous commit (git parent).
|
|
|
|
|
|
diff --git a/Makefile.def b/Makefile.def
|
|
index 0cdf044c5c3..364f7f3e011 100644
|
|
--- a/Makefile.def
|
|
+++ b/Makefile.def
|
|
@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
|
|
dependencies = { module=all-binutils; on=all-gas; };
|
|
dependencies = { module=all-binutils; on=all-libctf; };
|
|
dependencies = { module=all-ld; on=all-libctf; };
|
|
-dependencies = { module=install-ld; on=install-libctf; };
|
|
|
|
// We put install-opcodes before install-binutils because the installed
|
|
// binutils might be on PATH, and they might need the shared opcodes
|
|
@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
|
|
dependencies = { module=install-binutils; on=install-opcodes; };
|
|
dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
|
|
|
|
+// Likewise for ld, libctf, and bfd.
|
|
+dependencies = { module=install-libctf; on=install-bfd; };
|
|
+dependencies = { module=install-ld; on=install-bfd; };
|
|
+dependencies = { module=install-ld; on=install-libctf; };
|
|
+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
|
|
+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
|
|
+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
|
|
+
|
|
// libopcodes depends on libbfd
|
|
dependencies = { module=install-opcodes; on=install-bfd; };
|
|
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 4f82fd0a47f..57da7ec0790 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
|
|
all-stage4-ld: maybe-all-stage4-libctf
|
|
all-stageprofile-ld: maybe-all-stageprofile-libctf
|
|
all-stagefeedback-ld: maybe-all-stagefeedback-libctf
|
|
-install-ld: maybe-install-libctf
|
|
install-binutils: maybe-install-opcodes
|
|
install-strip-binutils: maybe-install-strip-opcodes
|
|
+install-libctf: maybe-install-bfd
|
|
+install-ld: maybe-install-bfd
|
|
+install-ld: maybe-install-libctf
|
|
+install-strip-libctf: maybe-install-strip-bfd
|
|
+install-strip-ld: maybe-install-strip-bfd
|
|
+install-strip-ld: maybe-install-strip-libctf
|
|
install-opcodes: maybe-install-bfd
|
|
install-strip-opcodes: maybe-install-strip-bfd
|
|
configure-gas: maybe-configure-intl
|