diff options
| author | Zi Lin <lziest@google.com> | 2022-02-09 23:35:07 +0000 |
|---|---|---|
| committer | Zi Lin <lziest@google.com> | 2022-02-09 23:47:52 +0000 |
| commit | 138761fdcc8c2c074bef7700e39b47b44cc5bcc0 (patch) | |
| tree | aafa68f31c18627726261f3af23594488e94aaba | |
| parent | c628910028be8458900bf9b7c9fad9d5b42d3b04 (diff) | |
| download | minijail-138761fdcc8c2c074bef7700e39b47b44cc5bcc0.tar.gz | |
Makefile: revert the usage of $(ECHO) temporarily.
The usage of $(ECHO) causes 'make all' to fail: For some reason,
make attempts to resolve the first target before carrying out the recipes
defined in the match-all rule injected by common.mk.
While we investigate how to fix the problem, revert the usage of
$(ECHO) so it is not blocking any build scripts that uses 'make all'.
Bug: 218368855
Test: make clean && make all
Change-Id: I3cf54d840549cfd71712e945b7bd518f52e008f1
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -95,8 +95,7 @@ tests: TEST(CXX_BINARY(libminijail_unittest)) \ TEST(CXX_BINARY(syscall_filter_unittest)) \ TEST(CXX_BINARY(system_unittest)) \ TEST(CXX_BINARY(util_unittest)) \ - TEST(CXX_BINARY(config_parser_unittest)) \ - + TEST(CXX_BINARY(config_parser_unittest)) CC_BINARY(minijail0): LDLIBS += -lcap -ldl CC_BINARY(minijail0): $(CORE_OBJECT_FILES) \ @@ -185,7 +184,7 @@ libsyscalls.gen.o.depends: libsyscalls.gen.c # Only regenerate libsyscalls.gen.c if the Makefile or header changes. # NOTE! This will not detect if the file is not appropriate for the target. libsyscalls.gen.c: $(SRC)/libsyscalls.h $(SRC)/Makefile - @$(ECHO) "GEN $(subst $(SRC)/,,$<) -> $@" + @/bin/echo -e "GEN $(subst $(SRC)/,,$<) -> $@" $(QUIET)CC="$(CC)" $(SRC)/gen_syscalls.sh "$@" clean: CLEAN(libsyscalls.gen.c) @@ -198,7 +197,7 @@ libconstants.gen.o.depends: libconstants.gen.c # Only regenerate libconstants.gen.c if the Makefile or header changes. # NOTE! This will not detect if the file is not appropriate for the target. libconstants.gen.c: $(SRC)/libconstants.h $(SRC)/Makefile - @$(ECHO) "GEN $(subst $(SRC)/,,$<) -> $@" + @/bin/echo -e "GEN $(subst $(SRC)/,,$<) -> $@" $(QUIET)CC="$(CC)" $(SRC)/gen_constants.sh "$@" clean: CLEAN(libconstants.gen.c) |