| 12345678910111213141516171819202122232425262728 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Fri, 16 Jan 2015 03:49:40 +0100
- Subject: build: explicitly unexport CONFIG_SITE
- On systems with CONFIG_SITE in the environment (e.g. OpenSUSE) make will export
- the CONFIG_SITE set in include/package.mk by default. This will cause host
- builds to get the target site configuration, leading to all kinds of weirdness
- (wrong pointer size, wrong endianess).
- Fix this by explicitly unexporting CONFIG_SITE. The explicit export for the
- target builds overrides the unexport, so the target builds will still correctly
- get the site config.
- Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
- diff --git a/include/package.mk b/include/package.mk
- index 88ec3ef..53ca6de 100644
- --- a/include/package.mk
- +++ b/include/package.mk
- @@ -93,7 +93,7 @@ CONFIG_SITE:=$(INCLUDE_DIR)/site/$(REAL_GNU_TARGET_NAME)
- 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
- -unexport QUIET
- +unexport QUIET CONFIG_SITE
-
- ifeq ($(DUMP)$(filter prereq clean refresh update,$(MAKECMDGOALS)),)
- ifneq ($(if $(QUILT),,$(CONFIG_AUTOREBUILD)),)
|
