From 05e2d7933db6f67fb273c808b32148b01e43cd47 Mon Sep 17 00:00:00 2001 From: Brian Ward Date: Mon, 8 Jul 2024 10:53:11 -0400 Subject: [PATCH 1/2] Windows: Don't try to copy tbb.dll if TBB_TARGETS is undefined --- make/program | 2 ++ 1 file changed, 2 insertions(+) diff --git a/make/program b/make/program index d9f8b3d371..dbe595c77e 100644 --- a/make/program +++ b/make/program @@ -82,6 +82,7 @@ endif $(LINK.cpp) $(subst \,/,$*.o) $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(subst \,/,$(OUTPUT_OPTION)) ifeq ($(OS),Windows_NT) +ifneq(,$(TBB_TARGETS)) ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll)))) @echo 'Intel TBB is not in PATH.' @echo 'Consider calling ' @@ -94,6 +95,7 @@ ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll)))) fi endif endif +endif $(patsubst %.cpp,%$(STAN_FLAGS).d,$(CMDSTAN_MAIN)) : $(CMDSTAN_MAIN) $(COMPILE.cpp) $(DEPFLAGS) $< From 87801464b10cfc901972f57697a85ab3893373fd Mon Sep 17 00:00:00 2001 From: Brian Ward Date: Tue, 9 Jul 2024 11:10:48 -0400 Subject: [PATCH 2/2] Missing whitespace --- make/program | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/program b/make/program index dbe595c77e..dc21672334 100644 --- a/make/program +++ b/make/program @@ -82,7 +82,7 @@ endif $(LINK.cpp) $(subst \,/,$*.o) $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(subst \,/,$(OUTPUT_OPTION)) ifeq ($(OS),Windows_NT) -ifneq(,$(TBB_TARGETS)) +ifneq (,$(TBB_TARGETS)) ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll)))) @echo 'Intel TBB is not in PATH.' @echo 'Consider calling '