45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index 555d1c46..7dc74273 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -144,13 +144,13 @@ tests :
|
|
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
|
touch $(LIBNAME)
|
|
ifndef NO_FBLAS
|
|
- $(MAKE) -C test all
|
|
+ $(MAKE) -C test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
endif
|
|
- $(MAKE) -C utest all
|
|
+ $(MAKE) -C utest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
ifneq ($(NO_CBLAS), 1)
|
|
- $(MAKE) -C ctest all
|
|
+ $(MAKE) -C ctest FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
|
|
- $(MAKE) -C cpp_thread_test all
|
|
+ $(MAKE) -C cpp_thread_test FC="$(FC)" CC="$(CC)" COMMON_OPT="$(COMMON_OPT)" FCOMMON_OPT="$(FCOMMON_OPT)" all
|
|
endif
|
|
endif
|
|
endif
|
|
diff --git a/cpp_thread_test/Makefile b/cpp_thread_test/Makefile
|
|
index 81e3470e..d541b70d 100644
|
|
--- a/cpp_thread_test/Makefile
|
|
+++ b/cpp_thread_test/Makefile
|
|
@@ -1,13 +1,14 @@
|
|
-include ../Makefile.rule
|
|
+TOPDIR = ..
|
|
+include $(TOPDIR)/Makefile.system
|
|
|
|
all :: dgemv_tester dgemm_tester
|
|
|
|
dgemv_tester :
|
|
- $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemv_thread_safety.cpp ../libopenblas.a -lpthread -o dgemv_tester
|
|
+ $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemv_thread_safety.cpp ../$(LIBNAME) -lpthread -o dgemv_tester
|
|
./dgemv_tester
|
|
|
|
dgemm_tester : dgemv_tester
|
|
- $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemm_thread_safety.cpp ../libopenblas.a -lpthread -o dgemm_tester
|
|
+ $(CXX) $(COMMON_OPT) -Wall -Wextra -Wshadow -fopenmp -std=c++11 dgemm_thread_safety.cpp ../$(LIBNAME) -lpthread -o dgemm_tester
|
|
./dgemm_tester
|
|
|
|
clean ::
|