| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From f56ddb00a656af2e84f839738fad19909ac65047 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Saul Wold <sgw@linux.intel.com> |
| 3 | Date: Sun, 9 Mar 2014 15:22:15 +0200 |
| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 4 | Subject: [PATCH] Fix parallel make failure for archives |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Pending |
| 7 | |
| 8 | The lib and gnuefi makefiles were using the lib.a() form which compiles |
| 9 | and ar's as a pair instead of compiling all and then ar'ing which can |
| 10 | parallelize better. This was resulting in build failures on larger values |
| 11 | of -j. |
| 12 | |
| 13 | See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105 |
| 14 | for details. |
| 15 | |
| 16 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
| 17 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 18 | [Rebased for 3.0.6] |
| 19 | Signed-off-by: California Sullivan <california.l.sullivan@intel.com> |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 20 | [Rebased for 3.0.8] |
| 21 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | |
| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 23 | --- |
| 24 | lib/Makefile | 2 +- |
| 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 26 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 27 | diff --git a/lib/Makefile b/lib/Makefile |
| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 28 | index 1fc6a47..54b0ca7 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 29 | --- a/lib/Makefile |
| 30 | +++ b/lib/Makefile |
| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 31 | @@ -77,7 +77,7 @@ libsubdirs: |
| 32 | $(OBJS): libsubdirs |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 33 | |
| 34 | libefi.a: $(OBJS) |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 35 | - $(AR) $(ARFLAGS) $@ $^ |
| 36 | + $(AR) $(ARFLAGS) $@ $(OBJS) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 37 | |
| 38 | clean: |
| 39 | rm -f libefi.a *~ $(OBJS) */*.o |