|
@@ -1,4 +1,4 @@
|
|
|
-From 16865de66db33ca70872199e70d93efccecc8575 Mon Sep 17 00:00:00 2001
|
|
|
+From 48b2cdbcd761105e8ebad412fcbf23db1ac4ef7c Mon Sep 17 00:00:00 2001
|
|
|
From: Saul Wold <sgw@linux.intel.com>
|
|
|
Date: Sun, 9 Mar 2014 15:22:15 +0200
|
|
|
Subject: [PATCH 1/3] Fix parallel make failure for archives
|
|
@@ -17,13 +17,15 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
|
|
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
|
|
|
[Rebased for 3.0.6]
|
|
|
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
|
|
|
+[Rebased for 3.0.8]
|
|
|
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
|
|
---
|
|
|
gnuefi/Makefile | 3 ++-
|
|
|
lib/Makefile | 2 +-
|
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
|
|
diff --git a/gnuefi/Makefile b/gnuefi/Makefile
|
|
|
-index 2a61699..148106e 100644
|
|
|
+index 2a61699..89b560a 100644
|
|
|
--- a/gnuefi/Makefile
|
|
|
+++ b/gnuefi/Makefile
|
|
|
@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a
|
|
@@ -32,23 +34,23 @@ index 2a61699..148106e 100644
|
|
|
|
|
|
-libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
|
|
|
+libgnuefi.a: $(OBJS)
|
|
|
-+ $(AR) rv $@ $(OBJS)
|
|
|
++ $(AR) $(ARFLAGS) $@ $(OBJS)
|
|
|
|
|
|
clean:
|
|
|
rm -f $(TARGETS) *~ *.o $(OBJS)
|
|
|
diff --git a/lib/Makefile b/lib/Makefile
|
|
|
-index b8d1ce7..6ef8107 100644
|
|
|
+index 0e6410d..048751a 100644
|
|
|
--- a/lib/Makefile
|
|
|
+++ b/lib/Makefile
|
|
|
@@ -75,7 +75,7 @@ libsubdirs:
|
|
|
for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
|
|
|
|
|
|
libefi.a: $(OBJS)
|
|
|
-- $(AR) rv -U $@ $^
|
|
|
-+ $(AR) rv $@ $(OBJS)
|
|
|
+- $(AR) $(ARFLAGS) $@ $^
|
|
|
++ $(AR) $(ARFLAGS) $@ $(OBJS)
|
|
|
|
|
|
clean:
|
|
|
rm -f libefi.a *~ $(OBJS) */*.o
|
|
|
--
|
|
|
-2.9.4
|
|
|
+2.7.4
|
|
|
|