From 970ca550f25a3413ff2d1ba4f1cb97b62b7fd4b0 Mon Sep 17 00:00:00 2001
From: couriersud <couriersud@gmx.org>
Date: Thu, 7 May 2020 11:05:40 +0200
Subject: [PATCH] netlist: fix dependency building for nvcc build. (nw)

---
 src/lib/netlist/.gitignore     | 14 ++++++++++++--
 src/lib/netlist/build/makefile | 18 +++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/lib/netlist/.gitignore b/src/lib/netlist/.gitignore
index db6d315f3ef..946de7294de 100644
--- a/src/lib/netlist/.gitignore
+++ b/src/lib/netlist/.gitignore
@@ -5,8 +5,18 @@ buildVS/x64/*
 buildVS/.vs/*
 nltool
 nlwav
-nltool.exe
-nlwav.exe
+
+# Windows executables
+*.exe
+
+# Local doxygen binaries
 doxygen
 doxyindexer
 doxysearch.cgi
+
+# nltool/nlwav output files
+*.log
+*.wav
+
+# VS 2019
+*.user
\ No newline at end of file
diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile
index fbc24d490ff..6c9fea45002 100644
--- a/src/lib/netlist/build/makefile
+++ b/src/lib/netlist/build/makefile
@@ -73,7 +73,10 @@ TIDY_DB = $(OBJ)/compile_commands.json
 
 # LTO = -flto=4  -fuse-linker-plugin -flto-partition=balanced -Wodr
 
-CFLAGS =  $(LTO) -g -O3 -std=c++14 -I$(CURDIR)/.. -I$(CURDIR)/../.. $(CEXTRAFLAGS)
+CCOREFLAGS = -g -O3 -std=c++14 -I$(CURDIR)/.. -I$(CURDIR)/../.. 
+
+
+CFLAGS =  $(LTO) $(CCOREFLAGS) $(CEXTRAFLAGS)
 LDFLAGS = $(LTO) -g -O3 -std=c++14 $(LDEXTRAFLAGS)
 LIBS = -lpthread -ldl $(EXTRALIBS)
 
@@ -82,6 +85,8 @@ LD = @g++
 MD = @mkdir
 RM = @rm
 CLANG_TIDY = clang-tidy-11
+DEPENDCC=$(CC)
+
 
 ifndef FAST
 FAST=1
@@ -281,14 +286,17 @@ gcc9:
 	$(MAKE) CC=g++-9 LD=g++-9 CEXTRAFLAGS="-march=native -fext-numeric-literals -msse4.2 -Wall -pedantic -Wpedantic -Wsign-compare -Wextra" EXTRALIBS="-lquadmath"
 
 clang:
-	$(MAKE) CC=clang++-11 LD=clang++-11 OBJ=obj/clang CEXTRAFLAGS="-march=native -msse4.2 -Weverything -Wall -pedantic -Wpedantic -Werror -Wno-padded -Wno-weak-vtables -Wno-unused-template -Wno-missing-variable-declarations -Wno-float-equal -Wconversion -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-format-nonliteral  -Wno-exit-time-destructors"
+	$(MAKE) CC=clang++-11 LD=clang++-11 OBJ=obj/clang CEXTRAFLAGS="-march=native -msse4.2 -Weverything -Wall -pedantic -Wpedantic -Wno-padded -Wno-unused-template -Wno-missing-variable-declarations -Wno-float-equal -Wconversion -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-format-nonliteral  -Wno-exit-time-destructors"
+	#$(MAKE) CC=clang++-11 LD=clang++-11 OBJ=obj/clang CEXTRAFLAGS="-march=native -msse4.2 -Weverything -Wall -pedantic -Wpedantic -Werror -Wno-padded -Wno-weak-vtables -Wno-unused-template -Wno-missing-variable-declarations -Wno-float-equal -Wconversion -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-format-nonliteral  -Wno-exit-time-destructors"
 
 clang-5:
 	$(MAKE) CC=clang++-5.0 LD=clang++-5.0 CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-inconsistent-missing-destructor-override -Wno-unreachable-code -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors"
 
 nvcc:
-	$(MAKE) CC=/usr/local/cuda-9.0/bin/nvcc LD=/usr/local/cuda-9.2/bin/nvcc OBJ=obj/nvcc \
-		CEXTRAFLAGS="-x cu  -DNVCCBUILD=1 --expt-extended-lambda --expt-relaxed-constexpr --default-stream per-thread --restrict"
+	$(MAKE) CC=/usr/local/cuda-9.0/bin/nvcc LD=/usr/local/cuda-9.2/bin/nvcc \
+		OBJ=obj/nvcc CEXTRAFLAGS="-x cu  -DNVCCBUILD=1 --expt-extended-lambda \
+		--expt-relaxed-constexpr --default-stream per-thread --restrict" \
+		DEPENDCC=g++
 
 tidy_db: compile_commands_prefix $(ALL_TIDY_FILES) compile_commands_postfix
 
@@ -327,7 +335,7 @@ $(DEPEND): maketree $(SOURCES)
 	@echo creating $(DEPEND)
 	@rm -f $(DEPEND)
 	@for i in $(SOURCES); do \
-		$(CC) $(CFLAGS) -MM $$i -MT `echo $$i | sed -e 's+$(SRC)+$(OBJ)+' -e 's+.cpp+.o+' ` >> $(DEPEND); \
+		$(DEPENDCC) $(CCOREFLAGS) -MM $$i -MT `echo $$i | sed -e 's+$(SRC)+$(OBJ)+' -e 's+.cpp+.o+' ` >> $(DEPEND); \
 	done
 
 depend: $(DEPEND)