aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhitequark <whitequark@whitequark.org>2020-12-02 22:19:52 +0000
committerGitHub <noreply@github.com>2020-12-02 22:19:52 +0000
commit975b2d4283dcdc541d9fadbbd0e8269ef14ff265 (patch)
treec508a2d28212ceeee434890ff1686ffea37c5f95
parentc3eb346e1ecbed57200458d7bd0fdfd5add88ba4 (diff)
parent6a328e7032024e8abd3dda561733cac3a033ae60 (diff)
downloadyosys-975b2d4283dcdc541d9fadbbd0e8269ef14ff265.tar.gz
yosys-975b2d4283dcdc541d9fadbbd0e8269ef14ff265.tar.bz2
yosys-975b2d4283dcdc541d9fadbbd0e8269ef14ff265.zip
Merge pull request #2455 from gsomlo/gls-fedpkg-fixes
Fixes for building Fedora distro RPMs of yosys
-rw-r--r--Makefile5
-rw-r--r--passes/sat/freduce.cc1
2 files changed, 6 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c561b0c72..355b2a25e 100644
--- a/Makefile
+++ b/Makefile
@@ -608,6 +608,11 @@ $(eval $(call add_include_file,backends/cxxrtl/cxxrtl_vcd_capi.cc))
$(eval $(call add_include_file,backends/cxxrtl/cxxrtl_vcd_capi.h))
OBJS += kernel/driver.o kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys.o
+ifeq ($(ENABLE_ABC),1)
+ifneq ($(ABCEXTERNAL),)
+kernel/yosys.o: CXXFLAGS += -DABCEXTERNAL='"$(ABCEXTERNAL)"'
+endif
+endif
OBJS += kernel/cellaigs.o kernel/celledges.o kernel/satgen.o kernel/mem.o
kernel/log.o: CXXFLAGS += -DYOSYS_SRC='"$(YOSYS_SRC)"'
diff --git a/passes/sat/freduce.cc b/passes/sat/freduce.cc
index 762edfdfb..f87b85da9 100644
--- a/passes/sat/freduce.cc
+++ b/passes/sat/freduce.cc
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <string.h>
#include <algorithm>
+#include <limits>
USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN