From 2c04f44a808bab8dffad1d33a603c6da06a009b2 Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Mon, 4 Dec 2017 23:28:10 +0000 Subject: [PATCH] binutils, parser, utils: Exit from Makefile shell snippets Exit rather than returning from shell snippets in Makefiles. It is reported that returning causes the following error message with bash: /bin/sh: line 4: return: can only `return' from a function or sourced script Signed-off-by: Tyler Hicks Reported-by: Christian Boltz --- binutils/Makefile | 2 +- parser/Makefile | 2 +- utils/test/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/binutils/Makefile b/binutils/Makefile index 61748caab..7fb71813d 100644 --- a/binutils/Makefile +++ b/binutils/Makefile @@ -114,7 +114,7 @@ $(LIBAPPARMOR_A): echo "error: $@ is missing. Pick one of these possible solutions:" 1>&2; \ echo " 1) Build against the in-tree libapparmor by building it first and then trying again. See the top-level README for help." 1>&2; \ echo " 2) Build against the system libapparmor by adding USE_SYSTEM=1 to your make command." 1>&2;\ - return 1; \ + exit 1; \ fi endif diff --git a/parser/Makefile b/parser/Makefile index ca2a44e4c..4d370c367 100644 --- a/parser/Makefile +++ b/parser/Makefile @@ -179,7 +179,7 @@ $(LIBAPPARMOR_A): echo "error: $@ is missing. Pick one of these possible solutions:" 1>&2; \ echo " 1) Build against the in-tree libapparmor by building it first and then trying again. See the top-level README for help." 1>&2; \ echo " 2) Build against the system libapparmor by adding USE_SYSTEM=1 to your make command." 1>&2;\ - return 1; \ + exit 1; \ fi endif diff --git a/utils/test/Makefile b/utils/test/Makefile index db2312efb..d8250c4d5 100644 --- a/utils/test/Makefile +++ b/utils/test/Makefile @@ -43,7 +43,7 @@ ifndef USE_SYSTEM echo "error: $(LD_LIBRARY_PATH)libapparmor.so is missing. Pick one of these possible solutions:" 1>&2; \ echo " 1) Build against the in-tree libapparmor by building it first and then trying again. See the top-level README for help." 1>&2; \ echo " 2) Build against the system libapparmor by adding USE_SYSTEM=1 to your make command." 1>&2; \ - return 1; \ + exit 1; \ fi endif