Merge pull request #4515 from frjohnst/second_conflict

resolve second_ conflict which breaks xlf timef
This commit is contained in:
Martin Kroeker 2024-02-22 16:23:12 +01:00 committed by GitHub
commit 78a9ef35b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 3 deletions

View File

@ -101,8 +101,10 @@ SCLAUX = la_constants.o \
slaset.o slasq1.o slasq2.o slasq3.o slasq4.o slasq5.o slasq6.o \
slasr.o slasrt.o slassq.o slasv2.o spttrf.o sstebz.o sstedc.o \
ssteqr.o ssterf.o slaisnan.o sisnan.o \
slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o \
../INSTALL/second_$(TIMER).o
slartgp.o slartgs.o scombssq.o ../INSTALL/sroundup_lwork.o
ifneq ($(F_COMPILER), IBM)
SCLAUX += ../INSTALL/second_$(TIMER).o
endif
endif
ifneq "$(or $(BUILD_DOUBLE),$(BUILD_COMPLEX16))" ""
@ -124,7 +126,10 @@ DZLAUX = la_constants.o\
dlasr.o dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \
dsteqr.o dsterf.o dlaisnan.o disnan.o \
dlartgp.o dlartgs.o ../INSTALL/droundup_lwork.o \
../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o
../INSTALL/dlamch.o
ifneq ($(F_COMPILER), IBM)
DZLAUX += ../INSTALL/dsecnd_$(TIMER).o
endif
endif
#ifeq ($(BUILD_SINGLE),1)