From 0fa8098ff431850fc7a88c1e9473bebc3bc2b561 Mon Sep 17 00:00:00 2001
From: Akash Levy <akashlevy@gmail.com>
Date: Tue, 9 Apr 2024 07:16:11 -0700
Subject: [PATCH] Updates for pyosys on Mac

---
 Makefile        | 2 +-
 kernel/yosys.cc | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index d1e09dd28..0e18e2fa5 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ BREW_PREFIX := $(shell brew --prefix)/opt
 $(info $$BREW_PREFIX is [${BREW_PREFIX}])
 ifeq ($(ENABLE_PYOSYS),1)
 CXXFLAGS += -I$(BREW_PREFIX)/boost/include/boost
-LINKFLAGS += -L$(BREW_PREFIX)/boost/lib
+LINKFLAGS += -L$(BREW_PREFIX)/boost/lib -rpath /usr/local/lib
 endif
 CXXFLAGS += -I$(BREW_PREFIX)/readline/include
 LINKFLAGS += -L$(BREW_PREFIX)/readline/lib
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 57433d0d9..b8e06f2db 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -555,8 +555,10 @@ void yosys_setup()
 #undef X
 
 	#ifdef WITH_PYTHON
-		PyImport_AppendInittab((char*)"libyosys", INIT_MODULE);
-		Py_Initialize();
+		if (!Py_IsInitialized()) {
+			PyImport_AppendInittab((char*)"libyosys", INIT_MODULE);
+			Py_Initialize();
+		}
 		PyRun_SimpleString("import sys");
 		signal(SIGINT, SIG_DFL);
 	#endif