From 4a2fb187188ad25d557df43850372dc798dcff69 Mon Sep 17 00:00:00 2001
From: Roland Coeurjoly <rolandcoeurjoly@gmail.com>
Date: Sun, 25 Feb 2024 17:23:56 +0100
Subject: [PATCH] Changes in libs, passes and tests Makefiles. LDLIBS -> LIBS.
 LDFLAGS -> LINKFLAGS. CXX is clang++ or g++, not clang and gcc

---
 libs/ezsat/Makefile         |  5 ++---
 libs/subcircuit/Makefile    | 11 +++++------
 passes/techmap/Makefile.inc |  2 +-
 tests/unit/Makefile         |  2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/libs/ezsat/Makefile b/libs/ezsat/Makefile
index b1f864160..c41038dc9 100644
--- a/libs/ezsat/Makefile
+++ b/libs/ezsat/Makefile
@@ -1,9 +1,9 @@
 
 CC = clang
-CXX = clang
+CXX = clang++
 CXXFLAGS = -MD -Wall -Wextra -ggdb
 CXXFLAGS += -std=c++11 -O0
-LDLIBS = ../minisat/Options.cc ../minisat/SimpSolver.cc ../minisat/Solver.cc ../minisat/System.cc -lm -lstdc++
+LIBS = ../minisat/Options.cc ../minisat/SimpSolver.cc ../minisat/Solver.cc ../minisat/System.cc -lm -lstdc++
 
 
 all: demo_vec demo_bit demo_cmp testbench puzzle3d
@@ -27,4 +27,3 @@ clean:
 .PHONY: all test clean
 
 -include *.d
-
diff --git a/libs/subcircuit/Makefile b/libs/subcircuit/Makefile
index f81085b5b..3d93ad0a2 100644
--- a/libs/subcircuit/Makefile
+++ b/libs/subcircuit/Makefile
@@ -5,9 +5,9 @@ CONFIG := clang-debug
 # CONFIG := release
 
 CC = clang
-CXX = clang
+CXX = clang++
 CXXFLAGS = -MD -Wall -Wextra -ggdb
-LDLIBS = -lstdc++
+LIBS = -lstdc++
 
 ifeq ($(CONFIG),clang-debug)
 CXXFLAGS += -std=c++11 -O0
@@ -15,19 +15,19 @@ endif
 
 ifeq ($(CONFIG),gcc-debug)
 CC = gcc
-CXX = gcc
+CXX = g++
 CXXFLAGS += -std=gnu++0x -O0
 endif
 
 ifeq ($(CONFIG),profile)
 CC = gcc
-CXX = gcc
+CXX = g++
 CXXFLAGS += -std=gnu++0x -Os -DNDEBUG
 endif
 
 ifeq ($(CONFIG),release)
 CC = gcc
-CXX = gcc
+CXX = g++
 CXXFLAGS += -std=gnu++0x -march=native -O3 -DNDEBUG
 endif
 
@@ -50,4 +50,3 @@ clean:
 .PHONY: all test clean
 
 -include *.d
-
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index ed2f1c0bf..9d57e3d71 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -56,5 +56,5 @@ EXTRA_OBJS += passes/techmap/filterlib.o
 
 $(PROGRAM_PREFIX)yosys-filterlib$(EXE): passes/techmap/filterlib.o
 	$(Q) mkdir -p $(dir $@)
-	$(P) $(CXX) -o $(PROGRAM_PREFIX)yosys-filterlib$(EXE) $(LDFLAGS) $^ $(LDLIBS)
+	$(P) $(CXX) -o $(PROGRAM_PREFIX)yosys-filterlib$(EXE) $(LINKFLAGS) $^ $(LIBS)
 endif
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 9f1e5c99e..b4a752f8f 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -15,7 +15,7 @@ TESTS := $(addprefix $(BINTEST)/, $(basename $(ALLTESTFILE:%Test.cc=%Test.o)))
 all: prepare $(TESTS) run-tests
 
 $(BINTEST)/%: $(OBJTEST)/%.o
-	$(CXX) -L$(ROOTPATH) $(RPATH)=$(ROOTPATH) -o $@ $^ $(LDLIBS) \
+	$(CXX) -L$(ROOTPATH) $(RPATH)=$(ROOTPATH) -o $@ $^ $(LIBS) \
 		$(GTESTFLAG) $(EXTRAFLAGS)
 
 $(OBJTEST)/%.o: $(basename $(subst $(OBJTEST),.,%)).cc