filtered out -fopenmp and fix for mingw

This commit is contained in:
Werner Saar 2017-01-07 08:41:42 +01:00
parent 7c2c488c23
commit 1153e3ac39
2 changed files with 33 additions and 30 deletions

View File

@ -14,8 +14,9 @@ lib: lapacklib tmglib
clean: cleanlib cleantesting cleanblas_testing cleancblas_testing clean: cleanlib cleantesting cleanblas_testing cleancblas_testing
lapack_install: lapack_install:
( cd INSTALL; $(MAKE); ./testlsame; ./testslamch; ./testdlamch; \ ( cd INSTALL; $(MAKE) )
./testsecond; ./testdsecnd; ./testieee; ./testversion ) # ./testlsame; ./testslamch; ./testdlamch; \
# ./testsecond; ./testdsecnd; ./testieee; ./testversion )
blaslib: blaslib:
( cd BLAS/SRC; $(MAKE) ) ( cd BLAS/SRC; $(MAKE) )
@ -126,3 +127,4 @@ cleantesting:
cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting cleanall: cleanlib cleanblas_testing cleancblas_testing cleantesting
rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out rm -f *.a TESTING/*.out INSTALL/test* BLAS/*.out

View File

@ -525,6 +525,7 @@ ZLASRC = $(filter-out $(ZLAPACKOBJS),$(ZLASRC_O))
DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O)) DSLASRC = $(filter-out $(SLAPACKOBJS),$(DSLASRC_O))
ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O)) ZCLASRC = $(filter-out $(CLAPACKOBJS),$(ZCLASRC_O))
OPTS1 = $(filter-out -fopenmp, $(OPTS))
#end filter out #end filter out
@ -588,10 +589,10 @@ clean:
rm -f *.o DEPRECATED/*.o rm -f *.o DEPRECATED/*.o
.f.o: .f.o:
$(FORTRAN) $(OPTS) -c -o $@ $< $(FORTRAN) $(OPTS1) -c -o $@ $<
.F.o: .F.o:
$(FORTRAN) $(OPTS) -c $< -o $@ $(FORTRAN) $(OPTS1) -c $< -o $@
slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $< slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<
dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $< dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c -o $@ $<