--- testscpp/Makefile.orig	2022-12-19 19:58:20 UTC
+++ testscpp/Makefile
@@ -1,10 +1,10 @@
 ROOT := ..
 SRC := $(ROOT)/dwave/preprocessing/
 CATCH2 := $(ROOT)/testscpp/Catch2/single_include/
-DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())')
+#DIMOD := $(shell python -c 'import dimod; print(dimod.get_include())')
 SPDLOG := $(ROOT)/extern/spdlog/include/
 INCLUDES := -I $(SRC)/include/ -I $(DIMOD) -I $(CATCH2) -I $(SPDLOG)
-FLAGS := -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations -fcompare-debug-second -O3 
+FLAGS := ${CXXFLAGS} -std=c++17 -Wall -Wno-unknown-pragmas -Wno-sign-compare -Wno-deprecated-declarations
 
 all: update test_main test_main_parallel tests tests_parallel
 
@@ -15,12 +15,12 @@ tests_parallel: test_main_parallel.out
 	./test_main_parallel
 
 test_main: test_main.cpp
-	g++ $(FLAGS) -c test_main.cpp
-	g++ $(FLAGS) test_main.o tests/*.cpp -o test_main $(INCLUDES)
+	${CXX} $(FLAGS) -c test_main.cpp
+	${CXX} $(FLAGS) ${LDFLAGS} test_main.o tests/*.cpp -o test_main $(INCLUDES)
 
 test_main_parallel: test_main.cpp
-	g++ $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o
-	g++ $(FLAGS) -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES)
+	${CXX} $(FLAGS) -fopenmp -c test_main.cpp -o test_main_parallel.o
+	${CXX} $(FLAGS) ${LDFLAGS} -fopenmp test_main_parallel.o tests/*.cpp -o test_main_parallel $(INCLUDES)
 
 update:
 	git submodule init
