StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for duplicate names in whole static libs"

Browse Source
This commit is contained in:
Dan Albert
2014-05-27 18:23:26 +00:00
committed by Gerrit Code Review
parent 294301bb34 0e5ce8be34
commit 31101623b3
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/combo/select.mk
View File

@@ -53,7 +53,7 @@ $(combo_var_prefix)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar
$(combo_var_prefix)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing $(combo_var_prefix)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing
$(combo_var_prefix)GLOBAL_CPPFLAGS := $(combo_var_prefix)GLOBAL_CPPFLAGS :=
$(combo_var_prefix)GLOBAL_LDFLAGS := $(combo_var_prefix)GLOBAL_LDFLAGS :=
$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD $(combo_var_prefix)GLOBAL_ARFLAGS := cqsPD
$(combo_var_prefix)GLOBAL_LD_DIRS := $(combo_var_prefix)GLOBAL_LD_DIRS :=
$(combo_var_prefix)EXECUTABLE_SUFFIX := $(combo_var_prefix)EXECUTABLE_SUFFIX :=

36
core/definitions.mk
View File

@@ -1167,16 +1167,16 @@ endef
# $(1): the full path of the source static library. # $(1): the full path of the source static library.
define _extract-and-include-single-target-whole-static-lib define _extract-and-include-single-target-whole-static-lib
@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]" @echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\ $(hide) \
rm -rf $$ldir; \ for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1) | sort | uniq`; do \
mkdir -p $$ldir; \ i=0; \
filelist=; \ for ff in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1) $$f`; do \
for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) t $(1)`; do \ i=$$(($$i + 1)); \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) p $(1) $$f > $$ldir/$$f; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) xN $$i $(1) $$f; \
filelist="$$filelist $$ldir/$$f"; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) \
$(PRIVATE_ARFLAGS) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) $@ $$f; \
done ; \ done ; \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)TARGET_GLOBAL_ARFLAGS) \ done ;
$(PRIVATE_ARFLAGS) $@ $$filelist
endef endef
@@ -1204,16 +1204,16 @@ endef
# $(1): the full path of the source static library. # $(1): the full path of the source static library.
define _extract-and-include-single-host-whole-static-lib define _extract-and-include-single-host-whole-static-lib
@echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]" @echo "preparing StaticLib: $(PRIVATE_MODULE) [including $(1)]"
$(hide) ldir=$(PRIVATE_INTERMEDIATES_DIR)/WHOLE/$(basename $(notdir $(1)))_objs;\ $(hide) \
rm -rf $$ldir; \ for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) | \grep '\.o$$' | sort | uniq`; do \
mkdir -p $$ldir; \ i=0; \
filelist=; \ for ff in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) $$f`; do \
for f in `$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) t $(1) | \grep '\.o$$'`; do \ i=$$(($$i + 1)); \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) p $(1) $$f > $$ldir/$$f; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) xN $$i $(1) $$f; \
filelist="$$filelist $$ldir/$$f"; \ $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) \
$(PRIVATE_ARFLAGS) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) $@ $$f; \
done ; \ done ; \
$($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_AR) $($(PRIVATE_2ND_ARCH_VAR_PREFIX)HOST_GLOBAL_ARFLAGS) \ done ;
$(PRIVATE_ARFLAGS) $@ $$filelist
endef endef