Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
Change-Id: I2b1de0a253d341bcb7ee05fdc96bdc0d0967985e
This commit is contained in:
@@ -63,14 +63,34 @@ HOST_GLOBAL_ARFLAGS := cqs
|
|||||||
|
|
||||||
HOST_CUSTOM_LD_COMMAND := true
|
HOST_CUSTOM_LD_COMMAND := true
|
||||||
|
|
||||||
|
# Workaround for lack of "-Wl,--whole-archive" in MacOS's linker.
|
||||||
|
define _darwin-extract-and-include-single-whole-static-lib
|
||||||
|
@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
|
||||||
|
$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\
|
||||||
|
mkdir -p $$ldir; \
|
||||||
|
filelist=; \
|
||||||
|
for f in `$(TARGET_AR) t $(1)`; do \
|
||||||
|
$(TARGET_AR) p $(1) $$f > $$ldir/$$f; \
|
||||||
|
filelist="$$filelist $$ldir/$$f"; \
|
||||||
|
done ;
|
||||||
|
|
||||||
|
endef
|
||||||
|
|
||||||
|
define darwin-extract-and-include-whole-static-libs
|
||||||
|
$(if $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), $(hide) rm -rf $(PRIVATE_INTERMEDIATES_DIR)/WHOLE)
|
||||||
|
$(foreach lib,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), \
|
||||||
|
$(call _darwin-extract-and-include-single-whole-static-lib, $(lib)))
|
||||||
|
endef
|
||||||
|
|
||||||
define transform-host-o-to-shared-lib-inner
|
define transform-host-o-to-shared-lib-inner
|
||||||
|
$(call darwin-extract-and-include-whole-static-libs)
|
||||||
$(hide) $(PRIVATE_CXX) \
|
$(hide) $(PRIVATE_CXX) \
|
||||||
-dynamiclib -single_module -read_only_relocs suppress \
|
-dynamiclib -single_module -read_only_relocs suppress \
|
||||||
$(HOST_GLOBAL_LD_DIRS) \
|
$(HOST_GLOBAL_LD_DIRS) \
|
||||||
$(HOST_GLOBAL_LDFLAGS) \
|
$(HOST_GLOBAL_LDFLAGS) \
|
||||||
$(PRIVATE_ALL_OBJECTS) \
|
$(PRIVATE_ALL_OBJECTS) \
|
||||||
|
$(if $(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES), `find $(PRIVATE_INTERMEDIATES_DIR)/WHOLE -name '*.o' 2>/dev/null`) \
|
||||||
$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
|
$(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \
|
||||||
$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
|
|
||||||
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
|
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--start-group) \
|
||||||
$(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
|
$(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \
|
||||||
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
|
$(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \
|
||||||
|
Reference in New Issue
Block a user