From bc6104ccca368b715022542bb5ba4c51f5961ad0 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 12 Sep 2013 17:25:13 +1000 Subject: Makefile: move config.guess install from binutils --- Makefile | 4 ++++ src/binutils.mk | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8a9d9e3..09dba06 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,10 @@ BUILD := $(shell '$(TOP_DIR)/tools/config.guess') BUILD_PKGS := $(shell grep -l 'BUILD_$$(BUILD)' '$(TOP_DIR)/src/'*.mk | $(SED) -n 's,.*src/\(.*\)\.mk,\1,p') PATH := $(PREFIX)/$(BUILD)/bin:$(PREFIX)/bin:$(PATH) +# install config.guess for general use +$(INSTALL) -d '$(PREFIX)/bin' +$(INSTALL) -m755 '$(TOP_DIR)/tools/config.guess' '$(PREFIX)/bin/' + # use a minimal whitelist of safe environment variables ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) diff --git a/src/binutils.mk b/src/binutils.mk index 32bd668..5fad282 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -19,10 +19,6 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # install config.guess for general use - $(INSTALL) -d '$(PREFIX)/bin' - $(INSTALL) -m755 '$(1)/config.guess' '$(PREFIX)/bin/' - # install target-specific autotools config file $(INSTALL) -d '$(PREFIX)/$(TARGET)/share' echo "ac_cv_build=`$(1)/config.guess`" > '$(PREFIX)/$(TARGET)/share/config.site' -- cgit v0.12