build: use config.site generated by autoconf-lean, drop hardcoded sit…

…efiles Signed-off-by: Felix Fietkau <[email protected]>
skullcrossbones · Feb 28, 2021 · f439e29 · f439e29
1 parent 32c664f
commit f439e29
Show file tree

Hide file tree

Showing 20 changed files with 1 addition and 535 deletions.
diff --git a/Makefile b/Makefile
@@ -82,12 +82,6 @@ endif
 
 # check prerequisites before starting to build
 prereq: $(target/stamp-prereq) tmp/.prereq_packages
-	@if [ ! -f "$(INCLUDE_DIR)/site/$(ARCH)" ]; then \
-		echo 'ERROR: Missing site config for architecture "$(ARCH)" !'; \
-		echo '       The missing file will cause configure scripts to fail during compilation.'; \
-		echo '       Please provide a "$(INCLUDE_DIR)/site/$(ARCH)" file and restart the build.'; \
-		exit 1; \
-	fi
 
 $(BIN_DIR)/profiles.json: FORCE
 	$(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \

diff --git a/include/package.mk b/include/package.mk
@@ -116,7 +116,7 @@ include $(INCLUDE_DIR)/autotools.mk
 _pkg_target:=$(if $(QUILT),,.)
 
 override MAKEFLAGS=
-CONFIG_SITE:=$(INCLUDE_DIR)/site/$(ARCH)
+CONFIG_SITE:=$(TOOLCHAIN_DIR)/config.site
 CUR_MAKEFILE:=$(filter-out Makefile,$(firstword $(MAKEFILE_LIST)))
 SUBMAKE:=$(NO_TRACE_MAKE) $(if $(CUR_MAKEFILE),-f $(CUR_MAKEFILE))
 PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig

diff --git a/include/site/aarch64 b/include/site/aarch64
diff --git a/include/site/aarch64_be b/include/site/aarch64_be
diff --git a/include/site/arc b/include/site/arc
diff --git a/include/site/arm b/include/site/arm
diff --git a/include/site/armeb b/include/site/armeb
diff --git a/include/site/i386 b/include/site/i386
diff --git a/include/site/i486 b/include/site/i486
diff --git a/include/site/i686 b/include/site/i686
diff --git a/include/site/linux b/include/site/linux
diff --git a/include/site/m68k b/include/site/m68k
diff --git a/include/site/mips b/include/site/mips
diff --git a/include/site/mips64 b/include/site/mips64