Skip to content

Commit a44422f

Browse files
authored
Merge pull request #3983 from thrasibule/makeflags
parallel build fixes
2 parents 73e6fcb + 397108f commit a44422f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ LAPACK_NOOPT := $(filter-out -O0 -O1 -O2 -O3 -Ofast -O -Og -Os,$(LAPACK_FFLAGS))
4040
SUBDIRS_ALL = $(SUBDIRS) test ctest utest exports benchmark ../laswp ../bench cpp_thread_test
4141

4242
.PHONY : all libs netlib $(RELA) test ctest shared install
43-
.NOTPARALLEL : all libs $(RELA) prof lapack-test install blas-test
43+
.NOTPARALLEL : shared
4444

45-
all :: libs netlib $(RELA) tests shared
45+
all :: tests
4646
@echo
4747
@echo " OpenBLAS build complete. ($(LIB_COMPONENTS))"
4848
@echo
@@ -150,7 +150,7 @@ ifeq ($(OSNAME), CYGWIN_NT)
150150
endif
151151
endif
152152

153-
tests : libs netlib $(RELA) shared
153+
tests : shared
154154
ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
155155
touch $(LIBNAME)
156156
ifndef NO_FBLAS

getarch.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,15 +1930,15 @@ printf("ELF_VERSION=2\n");
19301930

19311931
#ifdef MAKE_NB_JOBS
19321932
#if MAKE_NB_JOBS > 0
1933-
printf("MAKE += -j %d\n", MAKE_NB_JOBS);
1933+
printf("MAKEFLAGS += -j %d\n", MAKE_NB_JOBS);
19341934
#else
19351935
// Let make use parent -j argument or -j1 if there
19361936
// is no make parent
19371937
#endif
19381938
#elif NO_PARALLEL_MAKE==1
1939-
printf("MAKE += -j 1\n");
1939+
printf("MAKEFLAGS += -j 1\n");
19401940
#else
1941-
printf("MAKE += -j %d\n", get_num_cores());
1941+
printf("MAKEFLAGS += -j %d\n", get_num_cores());
19421942
#endif
19431943

19441944
break;

0 commit comments

Comments
 (0)