# These two changes are (respectively):
# * pass CC to ABC since clang is expected instead of clang++,
# * remove hardcoded CXX and LD to use environment-based tools instead.
#
# Both of these changes are required to build Yosys.

--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ bumpversion:
 ABCREV = 4f5f73d
 ABCPULL = 1
 ABCURL ?= https://github.com/YosysHQ/abc
-ABCMKARGS = CC="$(CXX)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
+ABCMKARGS = CC="$(CC)" CXX="$(CXX)" ABC_USE_LIBSTDCXX=1 VERBOSE=$(Q)
 
 # set ABCEXTERNAL = <abc-command> to use an external ABC instance
 # Note: The in-tree ABC (yosys-abc) will not be installed when ABCEXTERNAL is set.
@@ -185,8 +185,6 @@ endif
 endif
 
 ifeq ($(CONFIG),clang)
-CXX = clang
-LD = clang++
 CXXFLAGS += -std=c++11 -Os
 ABCMKARGS += ARCHFLAGS="-DABC_USE_STDINT_H"