mirror of
https://github.com/YosysHQ/yosys
synced 2025-10-19 05:42:16 +00:00
Merge branch 'YosysHQ:main' into master
This commit is contained in:
commit
7f5dcd270d
6 changed files with 33 additions and 7 deletions
8
Makefile
8
Makefile
|
@ -34,7 +34,7 @@ ENABLE_PYOSYS := 1
|
|||
ENABLE_GCOV := 0
|
||||
ENABLE_GPROF := 0
|
||||
ENABLE_DEBUG := 0
|
||||
ENABLE_LTO := 1
|
||||
ENABLE_LTO := 0
|
||||
ENABLE_CCACHE := 0
|
||||
# sccache is not always a drop-in replacement for ccache in practice
|
||||
ENABLE_SCCACHE := 0
|
||||
|
@ -153,7 +153,7 @@ ifeq ($(OS), Haiku)
|
|||
CXXFLAGS += -D_DEFAULT_SOURCE
|
||||
endif
|
||||
|
||||
YOSYS_VER := 0.43+86
|
||||
YOSYS_VER := 0.44
|
||||
|
||||
# Note: We arrange for .gitcommit to contain the (short) commit hash in
|
||||
# tarballs generated with git-archive(1) using .gitattributes. The git repo
|
||||
|
@ -169,7 +169,7 @@ endif
|
|||
OBJS = kernel/version_$(GIT_REV).o
|
||||
|
||||
bumpversion:
|
||||
sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline ead4718.. | wc -l`/;" Makefile
|
||||
# sed -i "/^YOSYS_VER := / s/+[0-9][0-9]*$$/+`git log --oneline ead4718.. | wc -l`/;" Makefile
|
||||
|
||||
ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q)
|
||||
|
||||
|
@ -223,7 +223,9 @@ LTOFLAGS := $(GCC_LTO)
|
|||
ifeq ($(CONFIG),clang)
|
||||
CXX = clang++
|
||||
CXXFLAGS += -std=$(CXXSTD) $(OPT_LEVEL)
|
||||
ifeq ($(ENABLE_LTO),1)
|
||||
LINKFLAGS += -fuse-ld=lld
|
||||
endif
|
||||
ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H $(ABC_ARCHFLAGS)"
|
||||
LTOFLAGS := $(CLANG_LTO)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue