commit 85f72449ae64869c5ddd5c4f6d8f0e034fe601ef
author Vishwath Mohan <vishwath@google.com> Wed Nov 01 09:21:20 2017 +0000
committer Vishwath Mohan <vishwath@google.com> Wed Nov 01 09:21:20 2017 +0000
tree 42e2ba5e96cb75a58f666e1ca62aced41ec0a6cb
parent 8350c4c540b6ad8a5e5ea01b6aacb9e92fa3d7dc

Revert "Revert "CFI compatibility with static executables and nested archives""

This reverts commit 8350c4c540b6ad8a5e5ea01b6aacb9e92fa3d7dc.

Reverting the revert so a proper fix can be applied.

Change-Id: I69f106dfd294198e03a62bcd88c8f18033410141

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index b988d1e..a8644d6 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1556,7 +1556,7 @@
         filelist="$$filelist $$ldir/$$ext$$f"; \
     done ; \
     $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \
-        $(2) $$filelist
+        $(PRIVATE_ARFLAGS) $(2) $$filelist
 
 endef