From b15d30ea0c8898f0c6f44c53f49047b3a321af92 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Sun, 7 Feb 2016 23:59:26 +0100 Subject: [PATCH] Fix Makefile build breakage. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e234c72c..5e771c9b 100644 --- a/Makefile +++ b/Makefile @@ -208,7 +208,7 @@ ifeq ($(SORTIX_INCLUDE_SOURCE),git) git clone --no-hardlinks $(SORTIX_INCLUDE_SOURCE_GIT_CLONE_OPTIONS) -- $(SORTIX_INCLUDE_SOURCE_GIT_REPO) "$(SYSROOT)/src" -cd "$(SYSROOT)/src" && for BRANCH in $(SORTIX_INCLUDE_SOURCE_GIT_BRANCHES); do \ git fetch origin $$BRANCH && \ - git branch -f $$BRANCH FETCH_HEAD ; \ + (git branch -f $$BRANCH FETCH_HEAD || true) ; \ done ifneq ($(SORTIX_INCLUDE_SOURCE_GIT_ORIGIN),) cd "$(SYSROOT)/src" && git remote set-url origin $(SORTIX_INCLUDE_SOURCE_GIT_ORIGIN) @@ -222,6 +222,7 @@ else ifneq ($(SORTIX_INCLUDE_SOURCE),no) cp Makefile -t "$(SYSROOT)/src" cp README -t "$(SYSROOT)/src" cp -RT build-aux "$(SYSROOT)/src/build-aux" + cp -RT share "$(SYSROOT)/src/share" (for D in $(MODULES); do (cp -R $$D -t "$(SYSROOT)/src" && $(MAKE) -C "$(SYSROOT)/src/$$D" clean) || exit $$?; done) endif (cd "$(SYSROOT)" && find .) | sed 's/\.//' | \