added some checks if python is enabled to make sure everything compiles if python is disabled in the makefile

This commit is contained in:
Benedikt Tutzer 2018-08-20 16:04:43 +02:00
parent d87c7df27f
commit 95d65971f3
5 changed files with 14 additions and 9 deletions

View File

@ -2783,13 +2783,13 @@ namespace YOSYS_PYTHON {
struct Initializer
{
Initializer() {
if(!Yosys::yosys_already_setup())
{
if(!Yosys::yosys_already_setup())
{
Yosys::log_streams.push_back(&std::cout);
Yosys::log_error_stderr = true;
Yosys::yosys_setup();
Yosys::yosys_banner();
}
}
}
Initializer(Initializer const &) {}

View File

@ -3925,14 +3925,12 @@ RTLIL::Process *RTLIL::Process::clone() const
return new_proc;
}
RTLIL::Memory::~Memory()
{
#ifdef WITH_PYTHON
RTLIL::Memory::get_all_memorys()->erase(hashidx_);
#endif
}
#ifdef WITH_PYTHON
RTLIL::Memory::~Memory()
{
RTLIL::Memory::get_all_memorys()->erase(hashidx_);
}
static std::map<unsigned int, RTLIL::Memory*> *all_memorys = new std::map<unsigned int, RTLIL::Memory*>();
std::map<unsigned int, RTLIL::Memory*> *RTLIL::Memory::get_all_memorys(void)
{

View File

@ -1175,6 +1175,7 @@ struct RTLIL::Memory : public RTLIL::AttrObject
unsigned int hash() const { return hashidx_; }
Memory();
~Memory();
RTLIL::IdString name;
int width, start_offset, size;

View File

@ -66,7 +66,9 @@
#include <stdio.h>
#include <limits.h>
#ifdef WITH_PYTHON
#include <Python.h>
#endif
#ifndef _YOSYS_
# error It looks like you are trying to build Yosys without the config defines set. \

View File

@ -44,7 +44,11 @@ void load_plugin(std::string filename, std::vector<std::string> aliases)
if (filename.find('/') == std::string::npos)
filename = "./" + filename;
#ifdef WITH_PYTHON
if (!loaded_plugins.count(filename) && !loaded_python_plugins.count(filename)) {
#else
if (!loaded_plugins.count(filename)) {
#endif
#ifdef WITH_PYTHON
if(boost::algorithm::ends_with(filename, ".py"))