fixes for cross compile
This commit is contained in:
parent
c40538eaeb
commit
a8516c5b47
12
Makefile
12
Makefile
|
@ -249,7 +249,7 @@ ifndef NOFORTRAN
|
||||||
-@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "SUFFIX = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
-@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "PSUFFIX = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
-@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "CEXTRALIB = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
ifeq ($(FC), gfortran)
|
ifeq ($(F_COMPILER), GFORTRAN)
|
||||||
-@echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
ifdef SMP
|
ifdef SMP
|
||||||
-@echo "LOADER = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
|
-@echo "LOADER = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
|
||||||
|
@ -288,7 +288,17 @@ endif
|
||||||
lapack-test :
|
lapack-test :
|
||||||
(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out)
|
(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out)
|
||||||
make -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintstrfd xlintstrfz xlintsts xlintstz xlintstzc xlintstrfs xlintstrfc
|
make -j 1 -C $(NETLIB_LAPACK_DIR)/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintstrfd xlintstrfz xlintsts xlintstz xlintstzc xlintstrfs xlintstrfc
|
||||||
|
ifneq ($(CROSS), 1)
|
||||||
|
( cd $(NETLIB_LAPACK_DIR)/INSTALL; ./testlsame; ./testslamch; ./testdlamch; \
|
||||||
|
./testsecond; ./testdsecnd; ./testieee; ./testversion )
|
||||||
(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )
|
(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )
|
||||||
|
endif
|
||||||
|
|
||||||
|
lapack-runtest:
|
||||||
|
( cd $(NETLIB_LAPACK_DIR)/INSTALL; ./testlsame; ./testslamch; ./testdlamch; \
|
||||||
|
./testsecond; ./testdsecnd; ./testieee; ./testversion )
|
||||||
|
(cd $(NETLIB_LAPACK_DIR); ./lapack_testing.py -r )
|
||||||
|
|
||||||
|
|
||||||
blas-test:
|
blas-test:
|
||||||
(cd $(NETLIB_LAPACK_DIR)/BLAS && rm -f x* *.out)
|
(cd $(NETLIB_LAPACK_DIR)/BLAS && rm -f x* *.out)
|
||||||
|
|
|
@ -971,16 +971,25 @@ ifeq ($(DEBUG), 1)
|
||||||
COMMON_OPT += -g
|
COMMON_OPT += -g
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(DEBUG), 1)
|
||||||
|
FCOMMON_OPT += -g
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef COMMON_OPT
|
ifndef COMMON_OPT
|
||||||
COMMON_OPT = -O2
|
COMMON_OPT = -O2
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifndef FCOMMON_OPT
|
||||||
|
FCOMMON_OPT = -O2 -frecursive
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR)
|
override CFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR)
|
||||||
override PFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -DPROFILE $(COMMON_PROF)
|
override PFLAGS += $(COMMON_OPT) $(CCOMMON_OPT) -I$(TOPDIR) -DPROFILE $(COMMON_PROF)
|
||||||
|
|
||||||
override FFLAGS += $(COMMON_OPT) $(FCOMMON_OPT)
|
override FFLAGS += $(FCOMMON_OPT)
|
||||||
override FPFLAGS += $(COMMON_OPT) $(FCOMMON_OPT) $(COMMON_PROF)
|
override FPFLAGS += $(FCOMMON_OPT) $(COMMON_PROF)
|
||||||
#MAKEOVERRIDES =
|
#MAKEOVERRIDES =
|
||||||
|
|
||||||
#For LAPACK Fortran codes.
|
#For LAPACK Fortran codes.
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
include ../make.inc
|
include ../make.inc
|
||||||
|
|
||||||
.SUFFIXES : .o .f
|
.SUFFIXES : .o .f
|
||||||
# all: testlsame testslamch testdlamch testsecond testdsecnd testieee testversion
|
all: slamch.o dlamch.o testlsame testslamch testdlamch testsecond testdsecnd testieee testversion
|
||||||
all: slamch.o dlamch.o
|
|
||||||
|
|
||||||
testlsame: lsame.o lsametst.o
|
testlsame: lsame.o lsametst.o
|
||||||
$(LOADER) $(LOADOPTS) -o testlsame lsame.o lsametst.o
|
$(LOADER) $(LOADOPTS) -o testlsame lsame.o lsametst.o
|
||||||
|
|
Loading…
Reference in New Issue