From 42cbfd2d17800b2f78f3988599589cac062a3a06 Mon Sep 17 00:00:00 2001 From: Chris Sidebottom Date: Sun, 25 Dec 2022 15:49:06 +0000 Subject: [PATCH] Don't gate reading of Makefile.conf This was gated behind GOTOBLAS_MAKEFILE, which looks like it's intended to stop the much more expensive run of `Makefile.prebuild` rather than prevent reading the configuration. Moving this `endif` means that things such as `dynamic_.c` correctly get the architecture flags. --- Makefile.system | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.system b/Makefile.system index 4350165f5..8113c26e7 100644 --- a/Makefile.system +++ b/Makefile.system @@ -283,6 +283,7 @@ GETARCH_FLAGS += -DHAVE_GAS=$(HAVE_GAS) # Generating Makefile.conf and config.h 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) +endif ifndef TARGET_CORE include $(TOPDIR)/Makefile.conf @@ -306,8 +307,6 @@ HAVE_FMA3= include $(TOPDIR)/Makefile_kernel.conf endif -endif - ifndef NUM_PARALLEL NUM_PARALLEL = 1 endif