Skip to content

Commit 2a4bb79

Browse files
authored
Merge pull request #2773 from martin-frbg/issue2770
Fix Makefiles still mishandling NO_CBLAS=0 and NO_LAPACKE=0
2 parents cbbe38b + 6193432 commit 2a4bb79

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ ifndef NO_FBLAS
141141
$(MAKE) -C test all
142142
endif
143143
$(MAKE) -C utest all
144-
ifndef NO_CBLAS
144+
ifneq ($(NO_CBLAS), 1)
145145
$(MAKE) -C ctest all
146146
ifeq ($(CPP_THREAD_SAFETY_TEST), 1)
147147
$(MAKE) -C cpp_thread_test all
@@ -244,7 +244,7 @@ ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
244244
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
245245
@$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
246246
endif
247-
ifndef NO_LAPACKE
247+
ifneq ($(NO_LAPACKE), 1)
248248
@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
249249
endif
250250
endif

interface/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ CZBLAS3OBJS += cblas_zgemm3m.$(SUFFIX)
367367
endif
368368

369369

370-
ifndef NO_CBLAS
370+
ifneq ($(NO_CBLAS), 1)
371371

372372
override CFLAGS += -I.
373373

0 commit comments

Comments
 (0)