Skip to content

Commit 2b3a2b0

Browse files
committed
fix mkl build
1 parent d8ff21c commit 2b3a2b0

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

Make.inc

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,18 +1007,7 @@ endif
10071007
endef
10081008
$(foreach proj,$(BB_PROJECTS),$(eval $(call SET_BB_DEFAULT,$(proj))))
10091009

1010-
# Some special restrictions on BB usage:
1011-
ifeq ($(USE_SYSTEM_BLAS),1)
1012-
# Since the names don't line up (`BLAS` vs. `OPENBLAS`), manually gate:
1013-
USE_BINARYBUILDER_OPENBLAS ?= 0
1014-
# Disable BB SuiteSparse if we're using system BLAS
1015-
USE_BINARYBUILDER_SUITESPARSE ?= 0
1016-
endif
10171010

1018-
ifeq ($(USE_SYSTEM_LIBM),1)
1019-
# If we're using system libm, disable BB OpenLibm
1020-
USE_BINARYBUILDER_OPENLIBM ?= 0
1021-
endif
10221011

10231012
# Use the Assertions build
10241013
BINARYBUILDER_LLVM_ASSERTS ?= 0
@@ -1253,6 +1242,19 @@ LDFLAGS += -cxxlib-nostd -static-intel
12531242
endif
12541243
endif
12551244

1245+
# Some special restrictions on BB usage:
1246+
ifeq ($(USE_SYSTEM_BLAS),1)
1247+
# Since the names don't line up (`BLAS` vs. `OPENBLAS`), manually gate:
1248+
USE_BINARYBUILDER_OPENBLAS := 0
1249+
# Disable BB SuiteSparse if we're using system BLAS
1250+
USE_BINARYBUILDER_SUITESPARSE := 0
1251+
endif
1252+
1253+
ifeq ($(USE_SYSTEM_LIBM),1)
1254+
# If we're using system libm, disable BB OpenLibm
1255+
USE_BINARYBUILDER_OPENLIBM := 0
1256+
endif
1257+
12561258
# Make tricks
12571259

12581260
define dir_target

0 commit comments

Comments
 (0)