diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-11-16 01:48:03 +0059 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-03-29 10:16:16 +0200 |
| commit | b45cdcf5e8cff894beb405fadecc07daaeb3e953 (patch) | |
| tree | 3ead7e4e91a7b434c737828e9bff9d84d9610e27 | |
| parent | c4eb0c48ca8b8d16c72e9dea423d41e1ed90d067 (diff) | |
| download | build-b45cdcf5e8cff894beb405fadecc07daaeb3e953.tar.gz | |
definitions.mk: Use sort |uniq instead of sort -u
This is a workaround for some broken versions of coreutils.
Since the expected output is the same, it doesn't affect
builds on working versions of sort.
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -rw-r--r-- | core/definitions.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 4ec1a7d780..a562f1f31f 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1467,7 +1467,7 @@ $(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \ find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list; \ fi $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ - | LANG=C sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq + | LANG=C sort | LANG=C uniq > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq $(hide) $(1) -encoding UTF-8 \ $(strip $(PRIVATE_JAVAC_DEBUG_FLAGS)) \ $(if $(findstring true,$(LOCAL_WARNINGS_ENABLE)),$(xlint_unchecked),) \ @@ -1506,7 +1506,7 @@ $(hide) if [ -e $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp ] ; then \ find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' $$newerFlag >> $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list; \ fi $(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \ - | LANG=C sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq + | LANG=C sort | LANG=C uniq > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq @echo "(Incremental) build source files:" @cat $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \ |