diff options
| author | Miodrag Milanović <mmicko@gmail.com> | 2022-07-06 10:39:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-06 10:39:48 +0200 |
| commit | 0cd20693c2a6dbbe74c45ddb6c8851a25c50e0df (patch) | |
| tree | b323bb94d65d5837fc23231bc93387a02415c853 /Makefile | |
| parent | 4c5152bf2687ee31ebc572803a88689d0267f54a (diff) | |
| parent | 0ca0932b5283a1bdd247a70ee179d64d425c4a44 (diff) | |
| download | yosys-0cd20693c2a6dbbe74c45ddb6c8851a25c50e0df.tar.gz yosys-0cd20693c2a6dbbe74c45ddb6c8851a25c50e0df.tar.bz2 yosys-0cd20693c2a6dbbe74c45ddb6c8851a25c50e0df.zip | |
Merge pull request #3399 from YosysHQ/abc_cpp
Update abc and build as C++
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -153,10 +153,10 @@ bumpversion: # is just a symlink to your actual ABC working directory, as 'make mrproper' # will remove the 'abc' directory and you do not want to accidentally # delete your work on ABC.. -ABCREV = 1863430 +ABCREV = f159bef ABCPULL = 1 ABCURL ?= https://github.com/YosysHQ/abc -ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q) +ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 ABC_USE_NAMESPACE=abc VERBOSE=$(Q) # set ABCEXTERNAL = <abc-command> to use an external ABC instance # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set. @@ -201,7 +201,7 @@ ifeq ($(CONFIG),clang) CXX = clang LD = clang++ CXXFLAGS += -std=$(CXXSTD) -Os -ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H" +ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -Wno-c++11-narrowing" ifneq ($(SANITIZER),) $(info [Clang Sanitizer] $(SANITIZER)) @@ -260,7 +260,7 @@ else ifeq ($(CONFIG),emcc) CXX = emcc LD = emcc CXXFLAGS := -std=$(CXXSTD) $(filter-out -fPIC -ggdb,$(CXXFLAGS)) -ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -DABC_MEMALIGN=8" +ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H -DABC_MEMALIGN=8 -Wno-c++11-narrowing" EMCC_CXXFLAGS := -Os -Wno-warn-absolute-paths EMCC_LDFLAGS := --memory-init-file 0 --embed-file share EMCC_LDFLAGS += -s NO_EXIT_RUNTIME=1 |