Skip to content

Commit 5d577ad

Browse files
authored
Merge pull request #3721 from isuruf/patch-1
Fix building tests when NOFORTRAN is not given at all
2 parents b949447 + d54971f commit 5d577ad

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ctest/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ endif
237237

238238
ifeq ($(BUILD_DOUBLE),1)
239239
# Double real
240-
ifeq ($(NOFORTRAN),0)
240+
ifeq ($(NOFORTRAN), $(filter 0 2,$(NOFORTRAN)))
241241
xdcblat1: $(dtestl1o) c_dblat1.o $(TOPDIR)/$(LIBNAME)
242242
$(FC) $(FLDFLAGS) -o xdcblat1 c_dblat1.o $(dtestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
243243
xdcblat2: $(dtestl2o) c_dblat2.o $(TOPDIR)/$(LIBNAME)
@@ -256,7 +256,7 @@ endif
256256

257257
ifeq ($(BUILD_COMPLEX),1)
258258
# Single complex
259-
ifeq ($(NOFORTRAN),0)
259+
ifeq ($(NOFORTRAN), $(filter 0 2,$(NOFORTRAN)))
260260
xccblat1: $(ctestl1o) c_cblat1.o $(TOPDIR)/$(LIBNAME)
261261
$(FC) $(FLDFLAGS) -o xccblat1 c_cblat1.o $(ctestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
262262
xccblat2: $(ctestl2o) c_cblat2.o $(TOPDIR)/$(LIBNAME)
@@ -278,7 +278,7 @@ endif
278278

279279
ifeq ($(BUILD_COMPLEX16),1)
280280
# Double complex
281-
ifeq ($(NOFORTRAN),0)
281+
ifeq ($(NOFORTRAN), $(filter 0 2,$(NOFORTRAN)))
282282
xzcblat1: $(ztestl1o) c_zblat1.o $(TOPDIR)/$(LIBNAME)
283283
$(FC) $(FLDFLAGS) -o xzcblat1 c_zblat1.o $(ztestl1o) $(LIB) $(EXTRALIB) $(CEXTRALIB)
284284
xzcblat2: $(ztestl2o) c_zblat2.o $(TOPDIR)/$(LIBNAME)

0 commit comments

Comments
 (0)