mirror of
https://github.com/YosysHQ/yosys
synced 2025-04-28 11:25:53 +00:00
Makefile: Redirect all git output
For some platforms (Arch Linux, at least), `git status` reports errors on stdout instead of stderr, so we need to redirect that to `/dev/null` too. This also prevents `git status` from logging output when the yosys directory is a git repo, but is missing the abc folder.
This commit is contained in:
parent
80dc946499
commit
1e8adc6bd0
1 changed files with 2 additions and 2 deletions
4
Makefile
4
Makefile
|
@ -785,7 +785,7 @@ $(PROGRAM_PREFIX)yosys-config: misc/yosys-config.in $(YOSYS_SRC)/Makefile
|
||||||
.PHONY: check-git-abc
|
.PHONY: check-git-abc
|
||||||
|
|
||||||
check-git-abc:
|
check-git-abc:
|
||||||
@if [ ! -d "$(YOSYS_SRC)/abc" ] && git -C "$(YOSYS_SRC)" status 2>/dev/null; then \
|
@if [ ! -d "$(YOSYS_SRC)/abc" ] && git -C "$(YOSYS_SRC)" status >/dev/null 2>&1; then \
|
||||||
echo "Error: The 'abc' directory does not exist."; \
|
echo "Error: The 'abc' directory does not exist."; \
|
||||||
echo "Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
|
echo "Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
|
@ -811,7 +811,7 @@ check-git-abc:
|
||||||
echo "3. Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
|
echo "3. Initialize the submodule: Run 'git submodule update --init' to set up 'abc' as a submodule."; \
|
||||||
echo "4. Reapply your changes: Move your saved changes back to the 'abc' directory, if necessary."; \
|
echo "4. Reapply your changes: Move your saved changes back to the 'abc' directory, if necessary."; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
elif ! git -C "$(YOSYS_SRC)" status 2>/dev/null; then \
|
elif ! git -C "$(YOSYS_SRC)" status >/dev/null 2>&1; then \
|
||||||
echo "$(realpath $(YOSYS_SRC)) is not configured as a git repository, and 'abc' folder is missing."; \
|
echo "$(realpath $(YOSYS_SRC)) is not configured as a git repository, and 'abc' folder is missing."; \
|
||||||
echo "If you already have ABC, set 'ABCEXTERNAL' make variable to point to ABC executable."; \
|
echo "If you already have ABC, set 'ABCEXTERNAL' make variable to point to ABC executable."; \
|
||||||
echo "Otherwise, download release archive 'yosys.tar.gz' from https://github.com/YosysHQ/yosys/releases."; \
|
echo "Otherwise, download release archive 'yosys.tar.gz' from https://github.com/YosysHQ/yosys/releases."; \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue