Merge pull request #3983 from thrasibule/makeflags
parallel build fixes
This commit is contained in:
commit
a44422f0d5
6
Makefile
6
Makefile
|
@ -40,9 +40,9 @@ LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
|
|||
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
|
||||
|
||||
.PHONY : all libs netlib $(RELA) test ctest shared install
|
||||
.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test
|
||||
.NOTPARALLEL : shared
|
||||
|
||||
all :: libs netlib $(RELA) tests shared
|
||||
all :: tests
|
||||
@echo
|
||||
@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
|
||||
@echo
|
||||
|
@ -150,7 +150,7 @@ ifeq ($(OSNAME), CYGWIN_NT)
|
|||
endif
|
||||
endif
|
||||
|
||||
tests : libs netlib $(RELA) shared
|
||||
tests : shared
|
||||
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
|
||||
touch $(LIBNAME)
|
||||
ifndef NO_FBLAS
|
||||
|
|
|
@ -1930,15 +1930,15 @@ printf("ELF_VERSION=2\n");
|
|||
|
||||
#ifdef MAKE_NB_JOBS
|
||||
#if MAKE_NB_JOBS > 0
|
||||
printf("MAKE += -j %d\n", MAKE_NB_JOBS);
|
||||
printf("MAKEFLAGS += -j %d\n", MAKE_NB_JOBS);
|
||||
#else
|
||||
// Let make use parent -j argument or -j1 if there
|
||||
// is no make parent
|
||||
#endif
|
||||
#elif NO_PARALLEL_MAKE==1
|
||||
printf("MAKE += -j 1\n");
|
||||
printf("MAKEFLAGS += -j 1\n");
|
||||
#else
|
||||
printf("MAKE += -j %d\n", get_num_cores());
|
||||
printf("MAKEFLAGS += -j %d\n", get_num_cores());
|
||||
#endif
|
||||
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue