From 2b3a2b0dc729b19165780d1f5a10bcd224491fb7 Mon Sep 17 00:00:00 2001 From: daviehh <25255906+daviehh@users.noreply.github.com> Date: Thu, 30 May 2019 21:53:41 -0400 Subject: [PATCH] fix mkl build --- Make.inc | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/Make.inc b/Make.inc index 77a58b266e2ed..fddcbc2fa93a6 100644 --- a/Make.inc +++ b/Make.inc @@ -1007,18 +1007,7 @@ endif endef $(foreach proj,$(BB_PROJECTS),$(eval $(call SET_BB_DEFAULT,$(proj)))) -# Some special restrictions on BB usage: -ifeq ($(USE_SYSTEM_BLAS),1) -# Since the names don't line up (`BLAS` vs. `OPENBLAS`), manually gate: -USE_BINARYBUILDER_OPENBLAS ?= 0 -# Disable BB SuiteSparse if we're using system BLAS -USE_BINARYBUILDER_SUITESPARSE ?= 0 -endif -ifeq ($(USE_SYSTEM_LIBM),1) -# If we're using system libm, disable BB OpenLibm -USE_BINARYBUILDER_OPENLIBM ?= 0 -endif # Use the Assertions build BINARYBUILDER_LLVM_ASSERTS ?= 0 @@ -1253,6 +1242,19 @@ LDFLAGS += -cxxlib-nostd -static-intel endif endif +# Some special restrictions on BB usage: +ifeq ($(USE_SYSTEM_BLAS),1) +# Since the names don't line up (`BLAS` vs. `OPENBLAS`), manually gate: +USE_BINARYBUILDER_OPENBLAS := 0 +# Disable BB SuiteSparse if we're using system BLAS +USE_BINARYBUILDER_SUITESPARSE := 0 +endif + +ifeq ($(USE_SYSTEM_LIBM),1) +# If we're using system libm, disable BB OpenLibm +USE_BINARYBUILDER_OPENLIBM := 0 +endif + # Make tricks define dir_target