[Debian-med-packaging] Bug#1110295: setcover FTCBFS: Hard-codes CC

[Nilesh Patra]

Package: setcover
Version: 0.0~git20161128.b1de791-2
Tags: patch
User: debian-cross at lists.debian.org
Usertags: ftcbfs
X-Debbugs-Cc: debian-cross at lists.debian.org

Dear Maintainer,

setcover FTCBFS due to hard-coding CC = g++ which ends up getting set to gcc during
cross compilation and hence the linking fails. Please use the patch below to fix the same.

--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
  PROGRAM = setcover
  C_FILES := $(shell find . ! -name "Test*" -name "*.cpp")
  OBJS := $(patsubst %.cpp, %.o, $(C_FILES))
-CC = g++
+CXX ?= g++
  CFLAGS = -Wall -m64 -ffast-math -ftree-vectorize -O3 -Wno-write-strings
  LDFLAGS =
  
  all: $(PROGRAM)
  
  $(PROGRAM): .depend $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(PROGRAM)
+	$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(PROGRAM)
  
  depend: .depend
  
@@ -24,10 +24,10 @@
  # variables used here, the variable $* that matches whatever % stands for
  # can be useful in special cases.
  %.o: %.cpp
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CXX) $(CFLAGS) -c $< -o $@
  
  %: %.cpp
-	$(CC) $(CFLAGS) -o $@ $<
+	$(CXX) $(CFLAGS) -o $@ $<
  
  clean:
  	rm -f .depend *.o