Skip to content

Commit 0fab882

Browse files
committed
#dae207a sort list of libs to avoid reinclude them
1 parent 3157b9a commit 0fab882

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

_charm/src/dae207a7538ff30aec99037cec6b2c0ad6857a50d0e0df70aaf0d165eaae5024.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<links>
88
<link name="parent">7bc74cc796c455a46d699ad91f6aca5b7c790f56a6a0968b4ecbce33efce9d25</link>
99
</links>
10-
<cf v="fred322 2025-04-29T10:33:15+02:00"/>
10+
<cf v="fred322 2025-04-29T10:48:45+02:00"/>
1111
</cr>

core/common-extlib.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -330,12 +330,12 @@ endif
330330
MODS_USELIBS=$(sort $(_modules_$(APPNAME)_uselib))
331331
MODS_NDUSELIBS=$(sort $(_modules_$(APPNAME)_nduselib))
332332

333-
EXTLIBS_ALL_USELIB=$(USELIB) $(MODS_USELIBS)
334-
EXTLIBS_ALL_NDUSELIB=$(NDUSELIB) $(MODS_NDUSELIBS)
333+
EXTLIBS_ALL_USELIB=$(sort $(USELIB) $(MODS_USELIBS))
334+
EXTLIBS_ALL_NDUSELIB=$(sort $(NDUSELIB) $(MODS_NDUSELIBS))
335335
EXTLIBS_ALL_NAUSELIB=$(NA_USELIB)
336336
EXTLIBS_ALL_NDNAUSELIB=$(NDNA_USELIB)
337337

338-
ALLUSELIB=$(USELIB) $(NDUSELIB) $(MODS_USELIBS) $(MODS_NDUSELIBS)
338+
ALLUSELIB=$(sort $(USELIB) $(NDUSELIB) $(MODS_USELIBS) $(MODS_NDUSELIBS))
339339
DEV_USELIB=$(filter-out $(DEV_USELIB_IGNORE),$(filter %d,$(ALLUSELIB)))
340340

341341
# macro to include lib
@@ -419,10 +419,10 @@ endef
419419
# we don't care importing the dependencies.
420420
ifeq ($(filter clean% purgeabs docker% tag,$(MAKECMDGOALS)),)
421421

422-
EXTLIBMAKES=$(patsubst %,$(EXTLIBDIR)/%/import.mk,$(subst |,-,$(USELIB) $(MODS_USELIBS))) \
423-
$(patsubst %,$(NDEXTLIBDIR)/%/import.mk,$(subst |,-,$(NDUSELIB) $(MODS_NDUSELIBS))) \
424-
$(patsubst %,$(NDNA_EXTLIBDIR)/%/import.mk,$(subst |,-,$(NDNA_USELIB))) \
425-
$(patsubst %,$(NA_EXTLIBDIR)/%/import.mk,$(subst |,-,$(NA_USELIB)))
422+
EXTLIBMAKES=$(patsubst %,$(EXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(USELIB) $(MODS_USELIBS)))) \
423+
$(patsubst %,$(NDEXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(NDUSELIB) $(MODS_NDUSELIBS)))) \
424+
$(patsubst %,$(NDNA_EXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(NDNA_USELIB)))) \
425+
$(patsubst %,$(NA_EXTLIBDIR)/%/import.mk,$(subst |,-,$(sort $(NA_USELIB))))
426426

427427
DEFAULT_EXTLIBMAKES:=$(EXTLIBMAKES)
428428

0 commit comments

Comments
 (0)