Skip to content

Commit acc32b2

Browse files
authored
Change Synlig exit message (#2559)
This PR adapts exit message.
2 parents ca23376 + 327944a commit acc32b2

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,8 @@ LINKFLAGS += -rdynamic
116116
LIBS += -lrt
117117
endif
118118

119-
# --- detect yosys version #
120-
YOSYS_VER := $(shell grep $(YOSYS_SRC)/Makefile -e "YOSYS_VER := " | head -n 1 | cut -d ' ' -f 3)
121-
GIT_REV := $(shell GIT_DIR=$(YOSYS_SRC)/.git git rev-parse --short=9 HEAD || echo UNKNOWN)
119+
# --- detect synlig hash --- #
120+
GIT_REV := $(shell GIT_DIR=$(REPO_DIR)/.git git rev-parse --short=9 HEAD || echo UNKNOWN)
122121
OBJS = kernel/version_$(GIT_REV).o
123122

124123
# --- set abc flags --- #
@@ -383,12 +382,12 @@ $(REPO_DIR)/src/frontends/systemverilog/%.o: $(REPO_DIR)/src/frontends/systemver
383382
$(Q) mkdir -p $(dir $@)
384383
$(P) $(CXX) -o $@ -c $(CPPFLAGS) $(CXXFLAGS) $<
385384

386-
YOSYS_VER_STR := Yosys $(YOSYS_VER) (git sha1 $(GIT_REV), $(notdir $(CXX)) $(shell \
385+
VERSION_STR := Synlig (git sha1 $(GIT_REV), $(notdir $(CXX)) $(shell \
387386
$(CXX) --version | tr ' ()' '\n' | grep '^[0-9]' | head -n1) $(filter -f% -m% -O% -DNDEBUG,$(CXXFLAGS)))
388387

389388
kernel/version_$(GIT_REV).cc: $(YOSYS_SRC)/Makefile
390389
$(P) rm -f kernel/version_*.o kernel/version_*.d kernel/version_*.cc
391-
$(Q) mkdir -p kernel && echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"$(YOSYS_VER_STR)\"; }" > kernel/version_$(GIT_REV).cc
390+
$(Q) mkdir -p kernel && echo "namespace Yosys { extern const char *yosys_version_str; const char *yosys_version_str=\"$(VERSION_STR)\"; }" > kernel/version_$(GIT_REV).cc
392391

393392
.PHONY: check-git-abc
394393

src/main.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,6 @@ int main(int argc, char **argv)
746746
log("End of script. Logfile hash: %s%sCPU: user %.2fs system %.2fs%s\n", hash.c_str(), stats_divider.c_str(),
747747
ru_buffer.ru_utime.tv_sec + 1e-6 * ru_buffer.ru_utime.tv_usec, ru_buffer.ru_stime.tv_sec + 1e-6 * ru_buffer.ru_stime.tv_usec,
748748
meminfo.c_str());
749-
log("%s\n", yosys_version_str);
750749

751750
int64_t total_ns = 0;
752751
std::set<tuple<int64_t, int, std::string>> timedat;

0 commit comments

Comments
 (0)