diff --git a/dev/make/function_definitions/lnx32e.mk b/dev/make/function_definitions/lnx32e.mk index dae2a04ba70..ea5e759520a 100644 --- a/dev/make/function_definitions/lnx32e.mk +++ b/dev/make/function_definitions/lnx32e.mk @@ -32,7 +32,6 @@ define set_daal_rt_deps $$(eval daaldep.lnx32e.rt.dpc := -lpthread -lOpenCL \ $$(if $$(COV.libia),$$(COV.libia)/libcov.a)) $$(eval daaldep.lnx32e.threxport := export_lnx32e.$$(BACKEND_CONFIG).def) - $$(eval daaldep.lnx32e.rt.tbb := -ltbb -lpthread) $$(eval daaldep.lnx.threxport.create = grep -v -E '^(EXPORTS|;|$$$$$$$$)' $$$$< $$$$(USECPUS.out.grep.filter) | sed -e 's/^/-u /') endef diff --git a/dev/make/function_definitions/win32e.mk b/dev/make/function_definitions/win32e.mk index b09eb4f8578..c37480ef549 100644 --- a/dev/make/function_definitions/win32e.mk +++ b/dev/make/function_definitions/win32e.mk @@ -29,7 +29,6 @@ define set_daal_rt_deps $$(eval daaldep.win32e.rt.seq := $$(dep_seq) \ $$(if $$(CHECK_DLL_SIG),Wintrust.lib)) $$(eval daaldep.win32e.threxport := export.def) - $$(eval daaldep.win32e.rt.tbb := $$(dep_tbb)) $$(eval daaldep.win.threxport.create = grep -v -E '^(;|$$$$$$$$)' $$$$< $$$$(USECPUS.out.grep.filter)) endef diff --git a/makefile b/makefile index e65c1b0d9e0..b6bf6299d86 100644 --- a/makefile +++ b/makefile @@ -330,7 +330,6 @@ $(eval $(call set_daal_rt_deps)) daaldep.rt.thr := $(daaldep.$(PLAT).rt.thr) daaldep.rt.seq := $(daaldep.$(PLAT).rt.seq) daaldep.rt.dpc := $(daaldep.$(PLAT).rt.dpc) -daaldep.rt.tbb := $(daaldep.$(PLAT).rt.tbb) # List oneAPI header files to populate release/include. release.ONEAPI.HEADERS.exclude := ! -path "*/backend/*" ! -path "*.impl.*" ! -path "*_test.*" ! -path "*/test/*" @@ -456,7 +455,7 @@ $(CORE.tmpdir_a)/$(core_a:%.$a=%_link.$a): $(CORE.tmpdir_a)/$(core_a:%.$a=%_lin $(WORKDIR.lib)/$(core_a): LOPT:= $(WORKDIR.lib)/$(core_a): $(daaldep.math_backend.ext) $(CORE.tmpdir_a)/$(core_a:%.$a=%_link.$a) ; $(LINK.STATIC) -$(WORKDIR.lib)/$(core_y): LOPT += $(-fPIC) $(daaldep.rt.tbb) +$(WORKDIR.lib)/$(core_y): LOPT += $(-fPIC) $(WORKDIR.lib)/$(core_y): LOPT += $(daaldep.rt.seq) $(WORKDIR.lib)/$(core_y): LOPT += $(if $(OS_is_win),-IMPLIB:$(@:%.$(MAJORBINARY).dll=%_dll.lib),) $(WORKDIR.lib)/$(core_y): LOPT += $(if $(OS_is_win),-LIBPATH:$(RELEASEDIR.tbb.libia),-L$(TBBDIR.soia.lnx)) @@ -1053,6 +1052,7 @@ $2/$(notdir $1): $(call frompf1,$1) | $2/. ; $(value cpy) endef $(foreach t,$(releasetbb.LIBS_Y),$(eval $(call .release.t,$t,$(RELEASEDIR.tbb.soia)))) $(foreach t,$(releasetbb.LIBS_A),$(eval $(call .release.t,$t,$(RELEASEDIR.tbb.libia)))) +$(if $(OS_is_win),$(foreach t,$(releasetbb.LIBS_Y),$(eval $(call .release.t,$t,$(RELEASEDIR.soia)))),) #----- cmake configs generation