Skip to content

Commit 8a56c8c

Browse files
authored
Merge pull request ARMmbed#3906 from rjpdasilva/master
uVisor: Fix 'publish' and core libs dependencies
2 parents 45c99e6 + 5b05982 commit 8a56c8c

File tree

1 file changed

+5
-4
lines changed
  • features/FEATURE_UVISOR/importer

1 file changed

+5
-4
lines changed

features/FEATURE_UVISOR/importer/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,13 @@ rsync:
8989
# Copying licenses
9090
cp $(UVISOR_DIR)/LICENSE* $(TARGET_SUPPORTED)
9191

92-
TARGET_M%: $(TARGET_SUPPORTED)/*/*/*_cortex_m%*.a
92+
TARGET_M%: TARGET_LIBS_FIND=$(wildcard $(TARGET_SUPPORTED)/*/*/*_cortex_m$(subst TARGET_M,,$@)*.a)
93+
TARGET_M%: rsync
9394
@printf "#\n# Copying $@ files...\n"
94-
mkdir $(foreach file,$^,$(dir $(file))$@)
95-
$(foreach file,$^,mv $(file) $(dir $(file))$@/lib$(notdir $(file));)
95+
mkdir $(foreach file,$(TARGET_LIBS_FIND),$(dir $(file))$@)
96+
$(foreach file,$(TARGET_LIBS_FIND),mv $(file) $(dir $(file))$@/lib$(notdir $(file));)
9697

97-
publish: rsync TARGET_M3 TARGET_M4
98+
publish: TARGET_M3 TARGET_M4
9899
#
99100
# Rename release directorires to TARGET_RELEASE filters...
100101
$(foreach dir, $(TARGET_LIST_RELEASE),mv $(dir) $(dir $(dir))TARGET_RELEASE;)

0 commit comments

Comments
 (0)