Changeset e160bfe8 in mainline for boot/Makefile

Timestamp:

2017-10-23T18:51:34Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

File:

• boot/Makefile (modified) (2 diffs)

boot/Makefile

@@ -117 +117 @@
                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
         done
-        if ls $(DIST_OVERLAY_PATH)/* >/dev/null; then \
+        if ls $(DIST_OVERLAY_PATH)/* >/dev/null 2>/dev/null; then \
                 cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \
         fi
@@ -126 +126 @@
         $(MAKE) -r -f $(POSTBUILD) clean PRECHECK=$(PRECHECK)
 endif
-        rm -f $(POST_OUTPUT) $(BOOT_OUTPUT) $(DEPEND) $(DEPEND_PREV) arch/*/include/common.h
+        rm -f $(POST_OUTPUT) $(BOOT_OUTPUT) arch/*/include/common.h
         find generic/src/ arch/*/src/ genarch/src/ -name '*.o' -follow -exec rm \{\} \;
+        find generic/src/ arch/*/src/ genarch/src/ -name '*.d' -follow -exec rm \{\} \;
 
 clean_dist: