Skip to content

Commit ac7efc6

Browse files
authored
Put more build information into Makefile.conf_last
1 parent cd8eb83 commit ac7efc6

File tree

2 files changed

+24
-4
lines changed

2 files changed

+24
-4
lines changed

Makefile

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,7 @@ export NO_LAPACK
3535
export C_LAPACK
3636
endif
3737

38-
ifeq ($(F_COMPILER),CRAY)
39-
LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -Og -Os,$(LAPACK_FFLAGS))
40-
else
4138
LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
42-
endif
4339

4440
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
4541

@@ -210,9 +206,25 @@ ifeq ($(DYNAMIC_OLDER), 1)
210206
@echo DYNAMIC_OLDER=1 >> Makefile.conf_last
211207
endif
212208
endif
209+
@echo TARGET=$(CORE) >> Makefile.conf_last
213210
ifdef USE_THREAD
214211
@echo USE_THREAD=$(USE_THREAD) >> Makefile.conf_last
215212
endif
213+
ifdef SMP
214+
ifdef NUM_THREADS
215+
@echo NUM_THREADS=$(NUM_THREADS) >> Makefile.conf_last
216+
else
217+
@echo NUM_THREADS=$(NUM_CORES) >> Makefile.conf_last
218+
endif
219+
endif
220+
ifeq ($(USE_OPENMP),1)
221+
@echo USE_OPENMP=1 >> Makefile.conf_last
222+
endif
223+
ifeq ($(INTERFACE64),1)
224+
@echo INTERFACE64=1 >> Makefile.conf_last
225+
endif
226+
@echo THELIBNAME=$(LIBNAME) >> Makefile.conf_last
227+
@echo THELIBSONAME=$(LIBSONAME) >> Makefile.conf_last
216228
@-ln -fs $(LIBNAME) $(LIBPREFIX).$(LIBSUFFIX)
217229
@touch lib.grd
218230

Makefile.install

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ export GOTOBLAS_MAKEFILE = 1
33
-include $(TOPDIR)/Makefile.conf_last
44
include ./Makefile.system
55

6+
ifdef THELIBNAME
7+
LIBNAME=$(THELIBNAME)
8+
LIBSONAME=$(THELIBSONAME)
9+
endif
10+
ifeq ($(INTERFACE64),1)
11+
USE_64BITINT=1
12+
endif
13+
614
PREFIX ?= /opt/OpenBLAS
715

816
OPENBLAS_INCLUDE_DIR := $(PREFIX)/include

0 commit comments

Comments
 (0)