Skip to content

Commit 3e64fa7

Browse files
authored
Settings from Makefile(_kernel).conf should be available to DYNAMIC_ARCH kernel builds
1 parent 18c99d3 commit 3e64fa7

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

Makefile.system

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,10 @@ GETARCH_FLAGS += -DHAVE_GAS=$(HAVE_GAS)
284284
# Generating Makefile.conf and config.h
285285
DUMMY := $(shell $(MAKE) -C $(TOPDIR) -f Makefile.prebuild CC="$(CC)" FC="$(FC)" HOSTCC="$(HOSTCC)" HOST_CFLAGS="$(GETARCH_FLAGS)" CFLAGS="$(CFLAGS)" BINARY=$(BINARY) USE_OPENMP=$(USE_OPENMP) DYNAMIC_ARCH=$(DYNAMIC_ARCH) TARGET_CORE=$(TARGET_CORE) ONLY_CBLAS=$(ONLY_CBLAS) TARGET=$(TARGET) all)
286286

287+
endif
288+
287289
ifndef TARGET_CORE
288-
include $(TOPDIR)/Makefile.conf
290+
-include $(TOPDIR)/Makefile.conf
289291
else
290292
HAVE_NEON=
291293
HAVE_VFP=
@@ -306,7 +308,6 @@ HAVE_FMA3=
306308
include $(TOPDIR)/Makefile_kernel.conf
307309
endif
308310

309-
endif
310311

311312
ifndef NUM_PARALLEL
312313
NUM_PARALLEL = 1

0 commit comments

Comments
 (0)