diff options
| author |   Yann E. MORIN" <yann.morin.1998@free.fr> | 2014-06-25 21:33:01 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@free.fr> | 2014-06-25 21:33:01 (GMT) |
| commit | 6ed78d4cba1a26d0804b68c4d036207100d7748c (patch) | |
| tree | 134d5a8e92f76b68f66c2edf7d76a0109a66ffb1 /samples | |
| parent | fba42547681f69289c3647c28612ddd2a1442354 (diff) | |
all: fix wildcard to work with make-4.x
In make-3.8x, the $(wildacrd) function would sort the entries,
while in make-4.x, it would just return the entries in any
unpredictable order [*]
Use the $(sort) function to get reproducible behaviour.
[*] Well, most probably the roder the entries appear when read
from readdir()
Reported-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: Andrew Ruder <andrew.ruder@elecsyscorp.com>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/samples.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/samples.mk b/samples/samples.mk index c0fd66a..e154e5c 100644 --- a/samples/samples.mk +++ b/samples/samples.mk @@ -2,8 +2,8 @@ # ---------------------------------------------------------- # Build the list of available samples -CT_TOP_SAMPLES := $(patsubst $(CT_TOP_DIR)/samples/%/crosstool.config,%,$(wildcard $(CT_TOP_DIR)/samples/*/crosstool.config)) -CT_LIB_SAMPLES := $(filter-out $(CT_TOP_SAMPLES),$(patsubst $(CT_LIB_DIR)/samples/%/crosstool.config,%,$(wildcard $(CT_LIB_DIR)/samples/*/crosstool.config))) +CT_TOP_SAMPLES := $(patsubst $(CT_TOP_DIR)/samples/%/crosstool.config,%,$(sort $(wildcard $(CT_TOP_DIR)/samples/*/crosstool.config))) +CT_LIB_SAMPLES := $(filter-out $(CT_TOP_SAMPLES),$(patsubst $(CT_LIB_DIR)/samples/%/crosstool.config,%,$(sort $(wildcard $(CT_LIB_DIR)/samples/*/crosstool.config)))) CT_SAMPLES := $(shell echo $(sort $(CT_TOP_SAMPLES) $(CT_LIB_SAMPLES)) \ |$(sed) -r -e 's/ /\n/g;' \ |$(sed) -r -e 's/(.*),(.*)/\2,\1/;' \ |