From a4d2776647d8646f93ac13e8ad4fc27e5e60fc78 Mon Sep 17 00:00:00 2001
From: Akash Levy <akash@silimate.com>
Date: Thu, 16 Jan 2025 14:45:58 -0800
Subject: [PATCH] Fix tcl-tk stuff for mac

---
 .github/workflows/test-build.yml | 3 ---
 Brewfile                         | 3 +--
 Makefile                         | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 11a9a643a..6979c90e0 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -68,7 +68,6 @@ jobs:
       - name: Build
         shell: bash
         run: |
-          export PATH="$(brew --prefix make)/libexec/gnubin:$PATH"
           mkdir build
           cd build
           make -f ../Makefile config-$CC SMALL=0 ENABLE_ABC=1 ENABLE_PLUGINS=1 ENABLE_PYOSYS=0 ENABLE_CCACHE=0 ENABLE_EDITLINE=0 VERIFIC_DIR=../verific
@@ -167,7 +166,6 @@ jobs:
       - name: Run tests
         shell: bash
         run: |
-          export PATH="$(brew --prefix make)/libexec/gnubin:$PATH"
           make -j$procs test TARGETS= EXTRA_TARGETS= CONFIG=$CC SMALL=0 ENABLE_ABC=1 ENABLE_PLUGINS=1 ENABLE_PYOSYS=0 ENABLE_CCACHE=0 ENABLE_EDITLINE=0
 
       - name: Report errors
@@ -217,5 +215,4 @@ jobs:
       - name: Run tests
         shell: bash
         run: |
-          export PATH="$(brew --prefix make)/libexec/gnubin:$PATH"
           make -C docs test -j${{ env.procs }} SMALL=0 ENABLE_ABC=1 ENABLE_PLUGINS=1 ENABLE_PYOSYS=0 ENABLE_CCACHE=0 ENABLE_EDITLINE=0
diff --git a/Brewfile b/Brewfile
index 634fe530b..1dab730ce 100644
--- a/Brewfile
+++ b/Brewfile
@@ -6,7 +6,7 @@ brew "git"
 brew "graphviz"
 brew "pkg-config"
 brew "python3"
-brew "tcl-tk"
+brew "tcl-tk@8"
 brew "xdot"
 brew "bash"
 brew "boost-python3"
@@ -15,4 +15,3 @@ brew "lld"
 
 brew "dwarfutils"
 brew "libelf"
-brew "make"
diff --git a/Makefile b/Makefile
index e0fc1c32a..482798db9 100644
--- a/Makefile
+++ b/Makefile
@@ -144,7 +144,7 @@ endif
 CXXFLAGS += -I$(BREW_PREFIX)/readline/include
 LINKFLAGS += -L$(BREW_PREFIX)/readline/lib
 PKG_CONFIG_PATH := $(BREW_PREFIX)/libffi/lib/pkgconfig:$(PKG_CONFIG_PATH)
-PKG_CONFIG_PATH := $(BREW_PREFIX)/tcl-tk/lib/pkgconfig:$(PKG_CONFIG_PATH)
+PKG_CONFIG_PATH := $(BREW_PREFIX)/tcl-tk@8/lib/pkgconfig:$(PKG_CONFIG_PATH)
 export PATH := $(BREW_PREFIX)/bison/bin:$(BREW_PREFIX)/gettext/bin:$(BREW_PREFIX)/flex/bin:$(BREW_PREFIX)/m4/bin:$(PATH)
 export LIBRARY_PATH := $(BREW_PREFIX)/dwarfutils/lib:$(BREW_PREFIX)/libelf/lib:$(LIBRARY_PATH)
 LIBS += -ldwarf -lelf            # SILIMATE: support for backward-cpp